qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject qpid-jms git commit: Enable temporary destination delete and the local tests for it, needs ActiveMQ 5.12-SNAPSHOT before the interop tests will work.
Date Wed, 04 Mar 2015 16:55:36 GMT
Repository: qpid-jms
Updated Branches:
  refs/heads/master a2a192138 -> af8bf0ded


Enable temporary destination delete and the local tests for it, needs
ActiveMQ 5.12-SNAPSHOT before the interop tests will work.

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

Branch: refs/heads/master
Commit: af8bf0ded76bfe38150516c8d66dc00d6d016b58
Parents: a2a1921
Author: Timothy Bish <tabish121@gmail.com>
Authored: Wed Mar 4 11:55:27 2015 -0500
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Wed Mar 4 11:55:27 2015 -0500

----------------------------------------------------------------------
 .../apache/qpid/jms/provider/amqp/AmqpProvider.java   | 14 +++++++-------
 .../qpid/jms/integration/SessionIntegrationTest.java  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/af8bf0de/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
index 71e00d3..3ecea6a 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpProvider.java
@@ -396,13 +396,13 @@ public class AmqpProvider implements Provider, TransportListener {
 
                         @Override
                         public void processDestination(JmsTemporaryDestination destination)
throws Exception {
-                            // AmqpTemporaryDestination td = connection.getTemporaryDestination(destination);
-                            // if(td != null) {
-                            //     td.close(request);
-                            // } else {
-                            // TODO: complete and test above. Signals deletion to peer by
closing the creating link if present.
-
-                            request.onSuccess();
+                            AmqpTemporaryDestination temporary = connection.getTemporaryDestination(destination);
+                            if (temporary != null) {
+                                temporary.close(request);
+                            } else {
+                                LOG.debug("Could not find temporary destination {} to delete.",
destination);
+                                request.onSuccess();
+                            }
                         }
                     });
 

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/af8bf0de/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
index acbef10..cde40b3 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java
@@ -221,7 +221,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
         }
     }
 
-    @Ignore // TODO: Need to complete implementation and update test peer link handle behaviour
+    //@Ignore // TODO: Need to complete implementation and update test peer link handle behaviour
     @Test(timeout = 5000)
     public void testCreateAndDeleteTemporaryQueue() throws Exception {
         try (TestAmqpPeer testPeer = new TestAmqpPeer();) {
@@ -264,7 +264,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase {
         }
     }
 
-    @Ignore // TODO: Need to complete implementation and update test peer link handle behaviour
+    //@Ignore // TODO: Need to complete implementation and update test peer link handle behaviour
     @Test(timeout = 5000)
     public void testCreateAndDeleteTemporaryTopic() throws Exception {
         try (TestAmqpPeer testPeer = new TestAmqpPeer();) {


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


Mime
View raw message