QPID-482 : Small performance tweaks

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@541247 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 15 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 585991d905..cc5af07b20 100644
--- a/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -60,9 +60,9 @@ public abstract class AMQDestination implements Destination, Referenceable
     private static final int IS_EXCLUSIVE_MASK = 0x2;
     private static final int IS_AUTODELETE_MASK = 0x4;
 
-    public static final byte QUEUE_TYPE = 1;
-    public static final byte TOPIC_TYPE = 2;
-    public static final byte UNKNOWN_TYPE = 3;
+    public static final Integer QUEUE_TYPE = Integer.valueOf(1);
+    public static final Integer TOPIC_TYPE = Integer.valueOf(2);
+    public static final Integer UNKNOWN_TYPE = Integer.valueOf(3);
 
     protected AMQDestination(String url) throws URLSyntaxException
     {
@@ -213,7 +213,7 @@ public abstract class AMQDestination implements Destination, Referenceable
     }
 
     public String toURL()
-    {
+    {        
         String url = _url;
         if(url == null)
         {
diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
index 13f544516a..e60539c064 100644
--- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
+++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessage.java
@@ -79,24 +79,22 @@ public abstract class AbstractJMSMessage extends AMQMessage implements org.apach
         this(contentHeader, deliveryTag);
 
         Integer type = contentHeader.getHeaders().getInteger(CustomJMSXProperty.JMS_QPID_DESTTYPE.getShortStringName());
-        int contentType = (type == null) ? AMQDestination.UNKNOWN_TYPE : type.intValue();
+
 
         AMQDestination dest;
 
-        switch (contentType)
-        {
 
-            case AMQDestination.QUEUE_TYPE:
+        if(AMQDestination.QUEUE_TYPE.equals(type))
+        {
                 dest = new AMQQueue(exchange, routingKey, routingKey);
-                break;
-
-            case AMQDestination.TOPIC_TYPE:
+        }
+        else if(AMQDestination.TOPIC_TYPE.equals(type))
+        {
                 dest = new AMQTopic(exchange, routingKey, null);
-                break;
-
-            default:
+        }
+        else
+        {
                 dest = new AMQUndefinedDestination(exchange, routingKey, null);
-                break;
         }
         //Destination dest = AMQDestination.createDestination(url);
         setJMSDestination(dest);