| commit | 081b84ec154bfff6ee83ca5ea0b3c35d4b4f0674 | [log] [tgz] |
|---|---|---|
| author | Kevan Lee Miller <kevan@apache.org> | Thu Aug 19 14:44:48 2010 +0000 |
| committer | Kevan Lee Miller <kevan@apache.org> | Thu Aug 19 14:44:48 2010 +0000 |
| tree | 068fd7dd2a8182bc8fa485e48ba56ecb1e9c6418 | |
| parent | 6dccacd297ff69accd4714485248e25a0d415451 [diff] |
GERONIMO-5152 fix potential NPE, if a null xaResource is returned git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@987165 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java b/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java index aab2927..0818ba5 100644 --- a/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java +++ b/geronimo-connector/src/main/java/org/apache/geronimo/connector/ActivationSpecNamedXAResourceFactory.java
@@ -51,7 +51,7 @@ public NamedXAResource getNamedXAResource() throws SystemException { try { XAResource[] xaResources = resourceAdapter.getXAResources(new ActivationSpec[]{activationSpec}); - if (xaResources == null || xaResources.length == 0) { + if (xaResources == null || xaResources.length == 0 || xaResources[0] == null) { return null; } return new WrapperNamedXAResource(xaResources[0], name);