activemq-commits mailing list archives

Author: chirino
Date: Fri Dec 14 16:19:40 2012
New Revision: 1421956

URL: http://svn.apache.org/viewvc?rev=1421956&view=rev
Log:
Avoid NPE and openwire test failures introduced /w new nolocal support.

Modified:
    activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala

Modified: activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala?rev=1421956&r1=1421955&r2=1421956&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
(original)
+++ activemq/activemq-apollo/trunk/apollo-openwire/src/main/scala/org/apache/activemq/apollo/openwire/OpenwireProtocolHandler.scala
Fri Dec 14 16:19:40 2012
@@ -952,7 +952,7 @@ class OpenwireProtocolHandler extends Pr
       if( delivery.message.codec eq OpenwireMessageCodec ) {
         val message = delivery.message.asInstanceOf[OpenwireMessage].message
         if( info.isNoLocal ) {
-          if( message.getProducerId.getParentId.getConnectionId == connection_context.info.getConnectionId.getValue
) {
+          if (message.getProducerId.getParentId.getConnectionId == info.getConsumerId.getParentId.getConnectionId
) {
             return false;
           }
         }