QPID-5596 : [Java] Address bugs found by FindBugs

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

1 files changed, 4 insertions, 7 deletions

diff --git a/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
index 213ea815f2..703547e2e8 100644
--- a/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
+++ b/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
@@ -38,9 +38,6 @@ public class AdminObjectFactory implements ObjectFactory
     @Override
     public Object getObjectInstance(Object object, Name name, Context context, Hashtable<?, ?> env) throws Exception
     {
-
-        Object instance = null;
-
         if (object instanceof Reference)
         {
             Reference ref = (Reference) object;
@@ -49,10 +46,10 @@ public class AdminObjectFactory implements ObjectFactory
             if (ref.getClassName().equals(QpidQueueImpl.class.getName()))
             {
                 RefAddr addr = ref.get(QpidQueueImpl.class.getName());
-                bindingURLString = (String) addr.getContent();
-
                 if (addr != null)
                 {
+                    bindingURLString = (String) addr.getContent();
+
                     return new QpidQueueImpl(bindingURLString);
                 }
 
@@ -61,14 +58,14 @@ public class AdminObjectFactory implements ObjectFactory
             if (ref.getClassName().equals(QpidTopicImpl.class.getName()))
             {
                 RefAddr addr = ref.get(QpidTopicImpl.class.getName());
-                bindingURLString = (String) addr.getContent();
 
                 if (addr != null)
                 {
+                    bindingURLString = (String) addr.getContent();
                     return new QpidTopicImpl(bindingURLString);
                 }
             }
         }
-        return instance;
+        return null;
     }
 }