Author: gtully
Date: Thu Aug 19 09:05:21 2010
New Revision: 987090

URL: http://svn.apache.org/viewvc?rev=987090&view=rev
Log:
fix regression - spec compliance with patch for https://issues.apache.org/activemq/browse/AMQ-2840, standard headers must be omitted from getPropopertyNames()

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java?rev=987090&r1=987089&r2=987090&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/command/ActiveMQMessage.java Thu Aug 19 09:05:21 2010
@@ -282,7 +282,7 @@ public class ActiveMQMessage extends Mes
     public Enumeration getPropertyNames() throws JMSException {
         try {
             Vector<String> result = new Vector<String>(this.getProperties().keySet());
-            result.addAll(new Vector<String>(JMS_PROPERTY_SETERS.keySet()));
+            // omit stand jms props are per spec
             return result.elements();
         } catch (IOException e) {
             throw JMSExceptionSupport.create(e);

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java?rev=987090&r1=987089&r2=987090&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java (original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/command/ActiveMQMessageTest.java Thu Aug 19 09:05:21 2010
@@ -354,8 +354,8 @@ public class ActiveMQMessageTest extends
         ActiveMQMessage msg = new ActiveMQMessage();
         String name1 = "floatProperty";
         msg.setFloatProperty(name1, 1.3f);
-        String name2 = "JMSXDeliveryCount";
-        msg.setIntProperty("name2", 1);
+        String name2 = "intProperty";
+        msg.setIntProperty(name2, 1);
         boolean found1 = false;
         boolean found2 = false;
         for (Enumeration iter = msg.getPropertyNames(); iter.hasMoreElements();) {