[JBJCA-1435] javax.resource.spi.Connector annotation validation fix

Fixes https://issues.redhat.com/browse/JBJCA-1435
ironjacamar · Nov 16, 2021 · fea6efa · fea6efa
1 parent 88a6c51
commit fea6efa
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/common/impl/src/main/java/org/jboss/jca/common/annotations/Annotations.java b/common/impl/src/main/java/org/jboss/jca/common/annotations/Annotations.java
@@ -243,6 +243,7 @@ private Connector processConnector(AnnotationRepository annotationRepository, Cl
    {
       Connector connector = null;
       Collection<Annotation> values = annotationRepository.getAnnotation(javax.resource.spi.Connector.class);
+      values = values != null ? values : Collections.emptyList();
       if (values != null)
       {
          if (values.size() == 1)
@@ -256,7 +257,7 @@ private Connector processConnector(AnnotationRepository annotationRepository, Cl
             connector = attachConnector(raClass, classLoader, connectorAnnotation, connectionDefinitions,
                                         configProperties, plainConfigProperties, inboundResourceadapter, adminObjs);
          }
-         else if (values.size() == 0)
+         else if (values.isEmpty())
          {
             // JBJCA-240
             if (xmlResourceAdapterClass == null || xmlResourceAdapterClass.equals(""))
@@ -275,10 +276,10 @@ else if (values.size() == 0)
             }
          }
       }
-      else
+      if (connector == null) // JBJCA-240 Combination: No @Connector or more than one but valid xmlResourceAdapterClass
       {
-         connector = attachConnector(xmlResourceAdapterClass, classLoader, null, connectionDefinitions, null, null,
-                                     inboundResourceadapter, adminObjs);
+          connector = attachConnector(xmlResourceAdapterClass, classLoader, null, connectionDefinitions, null, null,
+                  inboundResourceadapter, adminObjs);
       }
 
       return connector;