Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 5 additions & 4 deletions common/impl/src/main/java/org/jboss/jca/common/annotations/Annotations.java
View file
Open in desktop
Expand Up @@ -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)
Expand All @@ -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(""))
Expand All @@ -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;
Expand Down