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: https://issues.apache.org/jira/browse/QPIDJMS-36
Date Thu, 02 Apr 2015 20:15:29 GMT
Repository: qpid-jms
Updated Branches:
  refs/heads/master 66c4e9711 -> c0a184f2b


https://issues.apache.org/jira/browse/QPIDJMS-36

Use prefix to separate the producer and consumer links so they don't
overlap and can be more easily identified. 

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

Branch: refs/heads/master
Commit: c0a184f2b7e975511f8b4bae13c72cd08f140ea0
Parents: 66c4e97
Author: Timothy Bish <tabish121@gmail.com>
Authored: Thu Apr 2 16:14:41 2015 -0400
Committer: Timothy Bish <tabish121@gmail.com>
Committed: Thu Apr 2 16:14:41 2015 -0400

----------------------------------------------------------------------
 .../java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java     | 2 +-
 .../org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java     | 2 +-
 .../apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java  | 4 ++--
 .../apache/qpid/jms/provider/amqp/AmqpTransactionContext.java    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c0a184f2/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index bc5b26b..8ace382 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -155,7 +155,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo,
Receiver
 
         configureSource(source);
 
-        String receiverName = getConsumerId() + ":" + subscription;
+        String receiverName = "qpid-jms:receiver:" + getConsumerId() + ":" + subscription;
         if (resource.getSubscriptionName() != null && !resource.getSubscriptionName().isEmpty())
{
             // In the case of Durable Topic Subscriptions the client must use the same
             // receiver name which is derived from the subscription name property.

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c0a184f2/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
index 3643dc8..07d7fef 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpFixedProducer.java
@@ -260,7 +260,7 @@ public class AmqpFixedProducer extends AmqpProducer {
             target.setCapabilities(typeCapability);
         }
 
-        String senderName = sourceAddress + ":" + targetAddress;
+        String senderName = "qpid-jms:sender:" + sourceAddress + ":" + targetAddress;
 
         Sender sender = session.getProtonSession().sender(senderName);
         sender.setSource(source);

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c0a184f2/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
index eaa4a7e..131e656 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTemporaryDestination.java
@@ -85,9 +85,9 @@ public class AmqpTemporaryDestination extends AmqpAbstractResource<JmsTemporaryD
         String localDestinationName = resource.getName();
         String senderLinkName = null;
         if (resource.isQueue()) {
-            senderLinkName = TEMP_QUEUE_CREATOR + localDestinationName;
+            senderLinkName = "qpid-jms:" + TEMP_QUEUE_CREATOR + localDestinationName;
         } else {
-            senderLinkName = TEMP_TOPIC_CREATOR + localDestinationName;
+            senderLinkName = "qpid-jms:" + TEMP_TOPIC_CREATOR + localDestinationName;
         }
 
         // Just use a bare Source, this is a producer which

http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/c0a184f2/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
index f145f0a..184de9d 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpTransactionContext.java
@@ -134,7 +134,7 @@ public class AmqpTransactionContext extends AmqpAbstractResource<JmsSessionInfo,
         coordinator.setCapabilities(TxnCapability.LOCAL_TXN);
         Source source = new Source();
 
-        String coordinatorName = resource.getSessionId().toString();
+        String coordinatorName = "qpid-jms:coordinator:" + resource.getSessionId().toString();
 
         Sender sender = session.getProtonSession().sender(coordinatorName);
         sender.setSource(source);


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


Mime
View raw message