Author: markt
Date: Wed Mar 26 14:52:31 2014
New Revision: 1581875
URL: http://svn.apache.org/r1581875
Log:
More try-with-resources
Modified:
tomcat/trunk/TOMCAT-NEXT.txt
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
Modified: tomcat/trunk/TOMCAT-NEXT.txt
URL:
http://svn.apache.org/viewvc/tomcat/trunk/TOMCAT-NEXT.txt?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
--- tomcat/trunk/TOMCAT-NEXT.txt (original)
+++ tomcat/trunk/TOMCAT-NEXT.txt Wed Mar 26 14:52:31 2014
@@ -214,7 +214,7 @@ but possibly 7.1.x).
- Use of try with resources
- Started.
- javax.* complete
- - o.a.catalina.[ant to storeconfig] complete
+ - o.a.catalina.[ant to util] complete
- remainder TODO
- Catching multiple exceptions
- Started
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/group/ChannelCoordinator.java
Wed Mar 26 14:52:31 2014
@@ -232,12 +232,9 @@ public class ChannelCoordinator extends
startLevel = (startLevel & (~svc));
- }catch ( Exception x ) {
+ } catch (Exception x) {
throw new ChannelException(x);
- } finally {
-
}
-
}
@Override
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/NonBlockingCoordinator.java
Wed Mar 26 14:52:31 2014
@@ -507,34 +507,26 @@ public class NonBlockingCoordinator exte
}
public void memberAdded(Member member,boolean elect) {
+ if (membership == null) setupMembership();
+ if (membership.memberAlive(member)) super.memberAdded(member);
try {
- if ( membership == null ) setupMembership();
- if ( membership.memberAlive(member) ) super.memberAdded(member);
- try {
- fireInterceptorEvent(new
CoordinationEvent(CoordinationEvent.EVT_MBR_ADD,this,"Member
add("+member.getName()+")"));
- if (started && elect) startElection(false);
- }catch ( ChannelException x ) {
- log.error("Unable to start election when member was added.",x);
- }
- }finally {
+ fireInterceptorEvent(new
CoordinationEvent(CoordinationEvent.EVT_MBR_ADD,this,"Member
add("+member.getName()+")"));
+ if (started && elect) startElection(false);
+ } catch (ChannelException x) {
+ log.error("Unable to start election when member was added.",x);
}
-
}
@Override
public void memberDisappeared(Member member) {
+ membership.removeMember(member);
+ super.memberDisappeared(member);
try {
-
- membership.removeMember(member);
- super.memberDisappeared(member);
- try {
- fireInterceptorEvent(new
CoordinationEvent(CoordinationEvent.EVT_MBR_DEL,this,"Member
remove("+member.getName()+")"));
- if ( started && (isCoordinator() || isHighest()) )
- startElection(true); //to do, if a member disappears, only
the coordinator can start
- }catch ( ChannelException x ) {
- log.error("Unable to start election when member was
removed.",x);
- }
- }finally {
+ fireInterceptorEvent(new
CoordinationEvent(CoordinationEvent.EVT_MBR_DEL,this,"Member
remove("+member.getName()+")"));
+ if (started && (isCoordinator() || isHighest()))
+ startElection(true); //to do, if a member disappears, only the
coordinator can start
+ } catch (ChannelException x) {
+ log.error("Unable to start election when member was removed.",x);
}
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
Wed Mar 26 14:52:31 2014
@@ -204,18 +204,16 @@ public class TcpFailureDetector extends
super.heartbeat();
checkMembers(false);
}
- public void checkMembers(boolean checkAll) {
+ public void checkMembers(boolean checkAll) {
try {
if (membership == null) setupMembership();
synchronized (membership) {
- if ( !checkAll ) performBasicCheck();
+ if (!checkAll) performBasicCheck();
else performForcedCheck();
}
- }catch ( Exception x ) {
+ } catch (Exception x) {
log.warn("Unable to perform heartbeat on the
TcpFailureDetector.",x);
- } finally {
-
}
}
@@ -314,8 +312,7 @@ public class TcpFailureDetector extends
//could be a shutdown notification
if ( Arrays.equals(mbr.getCommand(),Member.SHUTDOWN_PAYLOAD) ) return
false;
- Socket socket = new Socket();
- try {
+ try (Socket socket = new Socket()) {
InetAddress ia = InetAddress.getByAddress(mbr.getHost());
InetSocketAddress addr = new InetSocketAddress(ia, mbr.getPort());
socket.setSoTimeout((int)readTimeout);
@@ -337,14 +334,12 @@ public class TcpFailureDetector extends
}
}//end if
return true;
- } catch ( SocketTimeoutException sx) {
+ } catch (SocketTimeoutException sx) {
//do nothing, we couldn't connect
- } catch ( ConnectException cx) {
+ } catch (ConnectException cx) {
//do nothing, we couldn't connect
- }catch (Exception x ) {
+ } catch (Exception x) {
log.error("Unable to perform failure detection check, assuming
member down.",x);
- } finally {
- try {socket.close(); } catch ( Exception ignore ){}
}
return false;
}
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
Wed Mar 26 14:52:31 2014
@@ -110,8 +110,6 @@ public class NioReplicationTask extends
log.error("Exception caught in
TcpReplicationThread.drainChannel.",e);
}
cancelKey(key);
- } finally {
-
}
key = null;
// done, ready for more, return to pool
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
Wed Mar 26 14:52:31 2014
@@ -308,9 +308,7 @@ public class NioSender extends AbstractS
} catch ( Exception x ) {
log.error("Unable to disconnect NioSender. msg="+x.getMessage());
if ( log.isDebugEnabled() ) log.debug("Unable to disconnect
NioSender. msg="+x.getMessage(),x);
- } finally {
}
-
}
public void reset() {
Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Wed Mar
26 14:52:31 2014
@@ -426,23 +426,11 @@ public class MemoryUserDatabase implemen
new MemoryUserCreationFactory(this), true);
// Parse the XML input file to load this database
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(file);
+ try (FileInputStream fis = new FileInputStream(file)) {
digester.parse(fis);
- } finally {
- if (fis != null) {
- try {
- fis.close();
- } catch (IOException ioe) {
- // Ignore
- }
- }
}
-
}
}
-
}
@@ -462,7 +450,6 @@ public class MemoryUserDatabase implemen
}
groups.remove(group.getGroupname());
}
-
}
Modified: tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1581875&r1=1581874&r2=1581875&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/util/ExtensionValidator.java Wed Mar
26 14:52:31 2014
@@ -30,7 +30,6 @@ import java.util.jar.Manifest;
import org.apache.catalina.Context;
import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
-import org.apache.tomcat.util.ExceptionUtils;
import org.apache.tomcat.util.res.StringManager;
@@ -329,27 +328,11 @@ public final class ExtensionValidator {
* @param inStream Input stream to a WAR or JAR file
* @return The WAR's or JAR's manifest
*/
- private static Manifest getManifest(InputStream inStream)
- throws IOException {
-
+ private static Manifest getManifest(InputStream inStream) throws
IOException {
Manifest manifest = null;
- JarInputStream jin = null;
-
- try {
- jin = new JarInputStream(inStream);
+ try (JarInputStream jin = new JarInputStream(inStream)) {
manifest = jin.getManifest();
- jin.close();
- jin = null;
- } finally {
- if (jin != null) {
- try {
- jin.close();
- } catch (Throwable t) {
- ExceptionUtils.handleThrowable(t);
- }
- }
}
-
return manifest;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
