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 2015/01/17 00:52:32 UTC

[2/2] qpid-jms git commit: Require that connect be called explicity to give better control

Require that connect be called explicity to give better control

Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/84bb63c7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/84bb63c7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/84bb63c7

Branch: refs/heads/master
Commit: 84bb63c7e08ba5a53074f4fb1267a3c8fd86370b
Parents: 23c0d73
Author: Timothy Bish <ta...@gmail.com>
Authored: Fri Jan 16 18:52:21 2015 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Fri Jan 16 18:52:21 2015 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java     | 1 +
 .../src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java | 1 -
 .../org/apache/qpid/jms/provider/failover/FailoverProvider.java     | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/84bb63c7/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
index 4c3d3bf..0f658b1 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionFactory.java
@@ -264,6 +264,7 @@ public class JmsConnectionFactory extends JNDIStorable implements ConnectionFact
 
         try {
             result = ProviderFactory.create(brokerURI);
+            result.connect();
         } catch (Exception ex) {
             LOG.error("Failed to create JMS Provider instance for: {}", brokerURI.getScheme());
             LOG.trace("Error: ", ex);

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/84bb63c7/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
index 1261b7a..51cb359 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderFactory.java
@@ -69,7 +69,6 @@ public abstract class ProviderFactory {
         try {
             ProviderFactory factory = findProviderFactory(remoteURI);
             result = factory.createProvider(remoteURI);
-            result.connect();
         } catch (Exception ex) {
             LOG.error("Failed to create Provider instance for {}, due to: {}", remoteURI.getScheme(), ex);
             LOG.trace("Error: ", ex);

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/84bb63c7/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 ad7929d..968519e 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
@@ -546,6 +546,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
                         LOG.debug("Connection attempt:[{}] to: {} in-progress", reconnectAttempts, target);
                         JmsSslContext.setCurrentSslContext(sslContext);
                         Provider provider = ProviderFactory.create(target);
+                        provider.connect();
                         initializeNewConnection(provider);
                         return;
                     } catch (Throwable e) {


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