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/10/12 16:14:03 UTC

qpid-jms git commit: QPIDJMS-122 Remove unnuecessary calls to connect from all but the public methods of Connection.

Repository: qpid-jms
Updated Branches:
  refs/heads/master 56cc60f4e -> fa7445ffb


QPIDJMS-122 Remove unnuecessary calls to connect from all but the public
methods of Connection.

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

Branch: refs/heads/master
Commit: fa7445ffb7de15b57975762233d67326e49d7344
Parents: 56cc60f
Author: Timothy Bish <ta...@gmail.com>
Authored: Mon Oct 12 10:13:48 2015 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Mon Oct 12 10:13:48 2015 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/qpid/jms/JmsConnection.java | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fa7445ff/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index 43607e4..88227c9 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -475,7 +475,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     protected void deleteTemporaryDestination(JmsTemporaryDestination destination) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             for (JmsSession session : sessions.values()) {
@@ -547,7 +546,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
     }
 
     void startResource(JmsResource resource) throws JMSException {
-        connect();
+        checkClosedOrFailed();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -564,7 +563,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
     }
 
     void stopResource(JmsResource resource) throws JMSException {
-        connect();
+        checkClosedOrFailed();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -581,7 +580,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
     }
 
     void destroyResource(JmsResource resource) throws JMSException {
-        connect();
+        checkClosedOrFailed();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -599,7 +598,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void send(JmsOutboundMessageDispatch envelope) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         // TODO - We don't currently have a way to say that an operation
         //        should be done asynchronously.  A send can be done async
@@ -627,7 +625,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void acknowledge(JmsInboundMessageDispatch envelope, ACK_TYPE ackType) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -640,7 +637,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void acknowledge(JmsSessionId sessionId) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -653,7 +649,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void unsubscribe(String name) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -671,7 +666,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void commit(JmsSessionId sessionId) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -689,7 +683,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void rollback(JmsSessionId sessionId) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -707,7 +700,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void recover(JmsSessionId sessionId) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();
@@ -725,7 +717,6 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
 
     void pull(JmsConsumerId consumerId, long timeout) throws JMSException {
         checkClosedOrFailed();
-        connect();
 
         try {
             ProviderFuture request = new ProviderFuture();


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