qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ritch...@apache.org
Subject svn commit: r888383 - in /qpid/branches/0.5.x-dev: ./ qpid/java/ qpid/java/client/src/main/java/org/apache/qpid/client/ qpid/java/client/src/main/java/org/apache/qpid/client/message/ qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/...
Date Tue, 08 Dec 2009 13:01:25 GMT
Author: ritchiem
Date: Tue Dec  8 13:01:24 2009
New Revision: 888383

URL: http://svn.apache.org/viewvc?rev=888383&view=rev
Log:
QPID-2242 : Fixed 0-10 code path's getJMSDestination() updated JMSDestinationTest to cover
more test cases:
- Recieving a msg via Queue,Topic
- Recieving a msg via Queue with a MessageListener
- Recieving a msg on a queue that was sent to a topic, requires JMX interface to perform message
move.

Merged from trunk r887948


Added:
    qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
      - copied unchanged from r887948, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
Removed:
    qpid/branches/0.5.x-dev/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/message/JMSDestinationTest.java
Modified:
    qpid/branches/0.5.x-dev/   (props changed)
    qpid/branches/0.5.x-dev/qpid/java/   (props changed)
    qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
    qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
    qpid/branches/0.5.x-dev/qpid/java/test-profiles/08Excludes

Propchange: qpid/branches/0.5.x-dev/
------------------------------------------------------------------------------
    svn:mergeinfo = /qpid/trunk:887948

Propchange: qpid/branches/0.5.x-dev/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec  8 13:01:24 2009
@@ -1,2 +1,2 @@
 /qpid/branches/java-broker-0-10/qpid/java:829414,829575
-/qpid/trunk/qpid/java:835115,884634-884635,884838,885765,887952,888246,888248,888250,888348
+/qpid/trunk/qpid/java:835115,884634-884635,884838,885765,887948,887952,888246,888248,888250,888348

Modified: qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java?rev=888383&r1=888382&r2=888383&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
(original)
+++ qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
Tue Dec  8 13:01:24 2009
@@ -784,11 +784,11 @@
 
                 break;
         }
+
     }
 
     void postDeliver(AbstractJMSMessage msg) throws JMSException
     {
-        msg.setJMSDestination(_destination);
         switch (_acknowledgeMode)
         {
 

Modified: qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=888383&r1=888382&r2=888383&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
(original)
+++ qpid/branches/0.5.x-dev/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
Tue Dec  8 13:01:24 2009
@@ -171,6 +171,11 @@
         _deliveryTag = deliveryTag;
         _readableProperties = (_messageProps != null);
 
+        AMQDestination dest;
+
+        dest = generateDestination(new AMQShortString(_deliveryProps.getExchange()),
+                                   new AMQShortString(_deliveryProps.getRoutingKey()));
+        setJMSDestination(dest);        
     }
 
 

Modified: qpid/branches/0.5.x-dev/qpid/java/test-profiles/08Excludes
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/test-profiles/08Excludes?rev=888383&r1=888382&r2=888383&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/test-profiles/08Excludes (original)
+++ qpid/branches/0.5.x-dev/qpid/java/test-profiles/08Excludes Tue Dec  8 13:01:24 2009
@@ -18,3 +18,5 @@
 org.apache.qpid.management.jmx.ManagementActorLoggingTest#*
 org.apache.qpid.server.queue.ModelTest#*
 
+// QPID-2242 exclude till issue has been resolved
+org.apache.qpid.test.client.message.JMSDestinationTest#*



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org


Mime
View raw message