Author: markt
Date: Sun Aug 26 18:24:46 2018
New Revision: 1839234
URL: http://svn.apache.org/viewvc?rev=1839234&view=rev
Log:
Keep SpotBugs happy
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java?rev=1839234&r1=1839233&r2=1839234&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/membership/StaticMembershipProvider.java
Sun Aug 26 18:24:46 2018
@@ -39,6 +39,7 @@ import org.apache.catalina.tribes.group.
import org.apache.catalina.tribes.group.RpcCallback;
import org.apache.catalina.tribes.group.RpcChannel;
import org.apache.catalina.tribes.util.Arrays;
+import org.apache.catalina.tribes.util.ExceptionUtils;
import org.apache.catalina.tribes.util.ExecutorFactory;
import org.apache.catalina.tribes.util.StringManager;
import org.apache.juli.logging.Log;
@@ -130,7 +131,10 @@ public class StaticMembershipProvider ex
if (this.channel != null) {
try {
stopMembership(this.getMembers());
- } catch ( Exception ignore){}
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ // Otherwise ignore
+ }
this.channel.removeChannelListener(this);
this.channel = null;
}
@@ -328,7 +332,9 @@ public class StaticMembershipProvider ex
InetSocketAddress addr = new InetSocketAddress(ia,
member.getPort());
socket.connect(addr, connectTimeout);
aliveMembers.add(member);
- } catch (Exception x) {//no-op
+ } catch (Throwable t) {
+ ExceptionUtils.handleThrowable(t);
+ // Otherwise ignore
}
}
return aliveMembers.toArray(new Member[0]);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
