QPID-1922 - Applied patch from Bryan Kearney

Java Agent does not support null / empty enums


git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@787261 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 8 insertions, 5 deletions

diff --git a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
index 3de978e34b..7c324fadb9 100644
--- a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
+++ b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/ClassBinding.java
@@ -472,7 +472,7 @@ public class ClassBinding implements TypeBinding
                 }
                 if ((mask & bit) == 0)
                 {
-                    log.trace("Going in exlude " + prop.getName());
+                    log.trace("Going in exclude " + prop.getName());
                     excludes.add(prop.getName());
                 }
                 bit *= 2;
diff --git a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java
index ef4abc743b..d2010dfed1 100644
--- a/java/management/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java
+++ b/java/management/agent/src/main/java/org/apache/qpid/agent/binding/EnumBinding.java
@@ -65,14 +65,17 @@ public class EnumBinding extends ClassBinding
     {
         // FIXME This only works with POJOs
         Object instance = null;
+        String value = null ;        
         try
         {
-            String value = dec.readStr16();
-            instance = Enum.valueOf((Class<Enum>) this.getJavaClass(), value);
+            value = dec.readStr16();
+            if ((value != null ) && (!value.isEmpty())) {
+                instance = Enum.valueOf((Class<Enum>) this.getJavaClass(), value);
+            } 
         } catch (Exception e)
         {
-            log.error("Could not create an enum of type "
-                    + this.javaClass.getName());
+            log.error(String.format("Could not create an enum of type %s with value %s",
+                    this.javaClass.getName(),value ));
             throw new BindingException(e);
         }
         return instance;