You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2018/03/16 02:40:44 UTC
qpid-jms git commit: QPIDJMS-365 Ensure failed provider is cleared if
close fails
Repository: qpid-jms
Updated Branches:
refs/heads/master 339781205 -> bb7b596bb
QPIDJMS-365 Ensure failed provider is cleared if close fails
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/bb7b596b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/bb7b596b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/bb7b596b
Branch: refs/heads/master
Commit: bb7b596bbed768b3e3cf03a02a8951b7fdd6d686
Parents: 3397812
Author: Timothy Bish <ta...@gmail.com>
Authored: Thu Mar 15 22:40:33 2018 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Thu Mar 15 22:40:33 2018 -0400
----------------------------------------------------------------------
.../apache/qpid/jms/provider/failover/FailoverProvider.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/bb7b596b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index 3f3fb1b..f57e69c 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -695,9 +695,11 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
try {
if (provider != null) {
provider.close();
- provider = null;
}
- } catch (Throwable ex) {}
+ } catch (Throwable ex) {
+ } finally {
+ provider = null;
+ }
}
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org