You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2008/08/12 17:58:59 UTC
svn commit: r685207 - in /incubator/qpid/trunk/qpid/java:
client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
Author: rhs
Date: Tue Aug 12 08:58:58 2008
New Revision: 685207
URL: http://svn.apache.org/viewvc?rev=685207&view=rev
Log:
QPID-1233: made getStringProperty(nonexistent) return null instead of NPE
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=685207&r1=685206&r2=685207&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java Tue Aug 12 08:58:58 2008
@@ -652,14 +652,7 @@
}
else if(o == null)
{
- if(propertyMap.containsKey(propertyName))
- {
- return null;
- }
- else
- {
- return String.valueOf(null);
- }
+ return null;
}
else if(o.getClass().isArray())
{
Modified: incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java?rev=685207&r1=685206&r2=685207&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java (original)
+++ incubator/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/basic/PropertyValueTest.java Tue Aug 12 08:58:58 2008
@@ -35,6 +35,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.jms.Connection;
import javax.jms.Destination;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -90,6 +91,16 @@
connection.start();
}
+ public void testGetNonexistent() throws Exception
+ {
+ Connection conn = getConnection();
+ Session ssn = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ Message m = ssn.createTextMessage();
+ String s = m.getStringProperty("nonexistent");
+ assertNull(s);
+ conn.close();
+ }
+
public void testOnce()
{
runBatch(1);