activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tab...@apache.org
Subject svn commit: r1487607 - /activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java
Date Wed, 29 May 2013 19:32:51 GMT
Author: tabish
Date: Wed May 29 19:32:51 2013
New Revision: 1487607

URL: http://svn.apache.org/r1487607
Log:
Fix test failure

Modified:
    activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java

Modified: activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java?rev=1487607&r1=1487606&r2=1487607&view=diff
==============================================================================
--- activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java
(original)
+++ activemq/trunk/activemq-client/src/main/java/org/apache/activemq/filter/PropertyExpression.java
Wed May 29 19:32:51 2013
@@ -142,7 +142,15 @@ public class PropertyExpression implemen
 
             @Override
             public Object evaluate(Message message) {
-                return message.getUserID();
+                Object userId = message.getUserID();
+                if (userId == null) {
+                    try {
+                        userId = message.getProperty("JMSXUserID");
+                    } catch (IOException e) {
+                    }
+                }
+
+                return userId;
             }
         });
         JMS_PROPERTY_EXPRESSIONS.put("JMSXGroupSeq", new SubExpression() {



Mime
View raw message