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 2016/04/05 18:50:42 UTC
[2/3] qpid-jms git commit: /QPIDJMS-168 fix potential NPE
/QPIDJMS-168 fix potential NPE
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a02c533a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a02c533a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a02c533a
Branch: refs/heads/master
Commit: a02c533a6a7184c0243025f8eebc67edb68643a4
Parents: c99ea85
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Apr 5 12:46:17 2016 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Apr 5 12:46:17 2016 -0400
----------------------------------------------------------------------
.../org/apache/qpid/jms/provider/failover/FailoverProvider.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a02c533a/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 6399080..fa20ee1 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
@@ -696,7 +696,9 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
LOG.info("Connection attempt:[{}] to: {} failed", reconnectAttempts, target);
failure = e;
try {
- provider.close();
+ if (provider != null) {
+ provider.close();
+ }
} catch (Throwable ex) {}
}
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org