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 16:50:15 UTC

qpid-jms git commit: QPIDJMS-365 Polish the logging a bit and prevent edge case NPE

Repository: qpid-jms
Updated Branches:
  refs/heads/master bb7b596bb -> d12430f9b


QPIDJMS-365 Polish the logging a bit and prevent edge case 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/d12430f9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/d12430f9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/d12430f9

Branch: refs/heads/master
Commit: d12430f9b6b60abbbd8c7f1a24b08928dbfafab7
Parents: bb7b596
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Mar 16 12:49:51 2018 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Mar 16 12:49:51 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/d12430f9/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 f57e69c..fe7ba53 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
@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.ConcurrentModificationException;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
@@ -679,7 +680,8 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
                         for (int i = 0; i < uris.size(); ++i) {
                             URI target = uris.getNext();
                             if (target == null) {
-                                LOG.warn("Failover URI collection unexpectedly modified during connection attempt.");
+                                LOG.trace("Failover URI collection unexpectedly modified during connection attempt.");
+                                failure = new ConcurrentModificationException("Failover URIs changed unexpectedly");
                                 continue;
                             }
 
@@ -708,7 +710,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
                             "No remote URI available for reconnection during connection attempt: " + reconnectAttempts);
                     }
                 } catch (Throwable unknownFailure) {
-                    LOG.info("Connection attempt:[{}] failed abnormally.", reconnectAttempts);
+                    LOG.warn("Connection attempt:[{}] failed abnormally.", reconnectAttempts);
                     failure = failure == null ? unknownFailure : failure;
                 } finally {
                     if (provider == null) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org