Author: rajith
Date: Thu Mar 3 06:22:14 2011
New Revision: 1076532
URL: http://svn.apache.org/viewvc?rev=1076532&view=rev
Log:
QPID-2930
The getPropertyNames method will filter out any property names whose values are
not allowed as per the JMS spec.
I could have used the ALLOWED map to check if a value is a valid type.
But unfortunately that map contains byte[] as a valid type, which is not
correct as per the JMS spec.
I did not want to modify that map or the behaviour of the setObjectProperty or
getObjectProperty methods as there might be applications out there that is
depending on it.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1076532&r1=1076531&r2=1076532&view=diff
==============================================================================
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
Thu Mar 3 06:22:14 2011
@@ -22,10 +22,12 @@
package org.apache.qpid.client.message;
import java.lang.ref.SoftReference;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -670,7 +672,19 @@ public class AMQMessageDelegate_0_10 ext
public Enumeration getPropertyNames() throws JMSException
{
- return
java.util.Collections.enumeration(getApplicationHeaders().keySet());
+ List<String> props = new ArrayList<String>();
+ Map<String, Object> propertyMap = getApplicationHeaders();
+ for (String prop: getApplicationHeaders().keySet())
+ {
+ Object value = propertyMap.get(prop);
+ if (value instanceof Boolean || value instanceof Number
+ || value instanceof String)
+ {
+ props.add(prop);
+ }
+ }
+
+ return java.util.Collections.enumeration(props);
}
public void setBooleanProperty(String propertyName, boolean b) throws
JMSException
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
