From 8c8130d0288446f88deef393823cccffcaed474d Mon Sep 17 00:00:00 2001 From: Robert Godfrey Date: Sun, 12 Sep 2010 22:40:40 +0000 Subject: QPID-2857 : Address issues found by running FindBugs against the Java codebase git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@996393 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/test/unit/message/NonQpidMessage.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'qpid/java/client/src/test') diff --git a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java index df53c796b2..b1cf23bb9e 100644 --- a/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java +++ b/qpid/java/client/src/test/java/org/apache/qpid/test/unit/message/NonQpidMessage.java @@ -26,6 +26,7 @@ import java.util.Hashtable; import javax.jms.Destination; import javax.jms.JMSException; import javax.jms.Message; +import javax.jms.MessageFormatException; public class NonQpidMessage implements Message { @@ -278,9 +279,17 @@ public class NonQpidMessage implements Message { return (Float) o; } + else if(o instanceof String) + { + return Float.valueOf((String)o); + } + else if(o == null) + { + throw new NullPointerException("No such property: " + string); + } else { - return Float.valueOf(null); + throw new MessageFormatException("getFloatProperty(\""+string+"\") failed as value is not a float: " + o); } } else @@ -300,7 +309,7 @@ public class NonQpidMessage implements Message } else { - return Double.valueOf(null); + return getFloatProperty(string); } } else -- cgit v1.2.1