activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1438570 - in /activemq/trunk: activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java pom.xml
Date Fri, 25 Jan 2013 16:07:12 GMT
Author: chirino
Date: Fri Jan 25 16:07:12 2013
New Revision: 1438570

URL: http://svn.apache.org/viewvc?rev=1438570&view=rev
Log:
Switch to proton snapshot to pick up fix /w link closing.  Also make a link fail if the address
is an empty string.


Modified:
    activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java?rev=1438570&r1=1438569&r2=1438570&view=diff
==============================================================================
--- activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
(original)
+++ activemq/trunk/activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
Fri Jan 25 16:07:12 2013
@@ -634,13 +634,13 @@ class AmqpProtocolConverter {
             return null;
         } else if( terminus instanceof org.apache.qpid.proton.amqp.messaging.Source) {
             org.apache.qpid.proton.amqp.messaging.Source source = (org.apache.qpid.proton.amqp.messaging.Source)terminus;
-            if( source.getAddress() == null ) {
+            if( source.getAddress() == null || source.getAddress().length()==0) {
                 throw new AmqpProtocolException("amqp:invalid-field", "source address not
set");
             }
             return ActiveMQDestination.createDestination(source.getAddress(), ActiveMQDestination.QUEUE_TYPE);
         } else if( terminus instanceof org.apache.qpid.proton.amqp.messaging.Target) {
             org.apache.qpid.proton.amqp.messaging.Target target = (org.apache.qpid.proton.amqp.messaging.Target)terminus;
-            if( target.getAddress() == null ) {
+            if( target.getAddress() == null || target.getAddress().length()==0) {
                 throw new AmqpProtocolException("amqp:invalid-field", "target address not
set");
             }
             return ActiveMQDestination.createDestination(target.getAddress(), ActiveMQDestination.QUEUE_TYPE);

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1438570&r1=1438569&r2=1438570&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Fri Jan 25 16:07:12 2013
@@ -94,7 +94,7 @@
     <org-apache-derby-version>10.9.1.0</org-apache-derby-version>
     <org.osgi.core-version>4.3.1</org.osgi.core-version>
     <p2psockets-version>1.1.2</p2psockets-version>
-    <qpid-proton-version>0.3.0-fuse-1</qpid-proton-version>
+    <qpid-proton-version>99.0.0-fuse-SNAPSHOT</qpid-proton-version>
     <qpid-jms-version>0.18</qpid-jms-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.0</rome-version>



Mime
View raw message