1 files changed, 13 insertions, 14 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
index 52c0eb263b..122a5c4ef2 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/JMSHeaderAdapter.java
@@ -20,18 +20,17 @@
  */
 package org.apache.qpid.client.message;
 
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Enumeration;
+import org.apache.qpid.AMQPInvalidClassException;
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.framing.FieldTable;
 
 import javax.jms.JMSException;
 import javax.jms.MessageFormatException;
-
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import org.apache.qpid.AMQPInvalidClassException;
-import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
+import java.util.Enumeration;
 
 
 public final class JMSHeaderAdapter
@@ -60,7 +59,7 @@ public final class JMSHeaderAdapter
             {
                 Object str = getHeaders().getObject(string);
 
-                if (str == null || !(str instanceof String))
+                if (!(str instanceof String))
                 {
                     throw new MessageFormatException("getBoolean can't use " + string + " item.");
                 }
@@ -89,7 +88,7 @@ public final class JMSHeaderAdapter
             {
                 Object str = getHeaders().getObject(string);
 
-                if (str == null || !(str instanceof String))
+                if (!(str instanceof String))
                 {
                     throw new MessageFormatException("getBoolean can't use " + string + " item.");
                 }
@@ -160,7 +159,7 @@ public final class JMSHeaderAdapter
             {
                 Object str = getHeaders().getObject(string);
 
-                if (str == null || !(str instanceof String))
+                if (!(str instanceof String))
                 {
                     throw new MessageFormatException("getByte can't use " + string + " item.");
                 }
@@ -228,7 +227,7 @@ public final class JMSHeaderAdapter
             {
                 Object str = getHeaders().getObject(string);
 
-                if (str == null || !(str instanceof String))
+                if (!(str instanceof String))
                 {
                     throw new MessageFormatException("getFloat can't use " + string + " item.");
                 }
@@ -285,7 +284,7 @@ public final class JMSHeaderAdapter
                         s = String.valueOf(o);
                     }
                 }
-            }//else return s // null;
+            }
         }
 
         return s;
@@ -527,7 +526,7 @@ public final class JMSHeaderAdapter
 //          apply when a property is used in a message selector expression. For
 //          example, suppose you set a property as a string value, as in the
 //          following:
-//              myMessage.setStringProperty("NumberOfOrders", "2");
+//              myMessage.setStringProperty("NumberOfOrders", "2")
 //          The following expression in a message selector would evaluate to false,
 //          because a string cannot be used in an arithmetic expression:
 //          "NumberOfOrders > 1"