[jboss-cvs] JBossAS SVN: r110979 - projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations.

[jboss-cvs-commits at lists.jboss.org]

Author: maeste
Date: 2011-03-21 10:23:16 -0400 (Mon, 21 Mar 2011)
New Revision: 110979

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
Log:
JBJCA-512

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java	2011-03-21 13:52:31 UTC (rev 110978)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java	2011-03-21 14:23:16 UTC (rev 110979)
@@ -197,7 +197,7 @@
       //md = processAuthenticationMechanism(md, annotationRepository);
 
       // @AdministeredObject
-      ArrayList<AdminObject> adminObjs = processAdministeredObject(annotationRepository, classLoader, 
+      ArrayList<AdminObject> adminObjs = processAdministeredObject(annotationRepository, classLoader,
          configPropertiesMap == null ? null : configPropertiesMap.get(Metadatas.ADMIN_OBJECT));
 
       //log.debug("ConnectorMetadata " + md);
@@ -752,11 +752,11 @@
       }
       return false;
    }
-   
+
    /**
     * hasAnnotation, if class c contains annotation targetClass
     *
-    * @param c 
+    * @param c
     * @param targetClass
     * @param annotationRepository
     * @return
@@ -768,11 +768,11 @@
          return false;
       for (Annotation annotation : values)
       {
-         if (annotation.getClassName().equals(c.getName()));
+         if (annotation.getClassName() != null && annotation.getClassName().equals(c.getName()))
             return true;
       }
       return false;
-   
+
    }
 
    /**