Repository: tomee Updated Branches: refs/heads/tomee-1.7.x 988a8d2cf -> 750ad70a1
TOMEE-1497 patch from Roman Boykov to avoid a NPE when outbound transactionSupport is null Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/750ad70a Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/750ad70a Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/750ad70a Branch: refs/heads/tomee-1.7.x Commit: 750ad70a18ef5e8dc785b5fb15f78b8522a36565 Parents: 988a8d2 Author: Romain Manni-Bucau <[email protected]> Authored: Tue Jan 20 13:37:57 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Tue Jan 20 13:37:57 2015 +0100 ---------------------------------------------------------------------- .../apache/openejb/config/AppInfoBuilder.java | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/750ad70a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java index 9c574be..ca7c552 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java @@ -63,6 +63,7 @@ import org.apache.openejb.jee.PortComponent; import org.apache.openejb.jee.ResourceAdapter; import org.apache.openejb.jee.ServiceImplBean; import org.apache.openejb.jee.Servlet; +import org.apache.openejb.jee.TransactionSupportType; import org.apache.openejb.jee.WebApp; import org.apache.openejb.jee.WebserviceDescription; import org.apache.openejb.jee.Webservices; @@ -504,16 +505,19 @@ class AppInfoBuilder { final OutboundResourceAdapter outbound = resourceAdapter.getOutboundResourceAdapter(); if (outbound != null) { String transactionSupport = "none"; - switch (outbound.getTransactionSupport()) { - case LOCAL_TRANSACTION: - transactionSupport = "local"; - break; - case NO_TRANSACTION: - transactionSupport = "none"; - break; - case XA_TRANSACTION: - transactionSupport = "xa"; - break; + final TransactionSupportType transactionSupportType = outbound.getTransactionSupport(); + if (transactionSupportType != null) { + switch (transactionSupportType) { + case LOCAL_TRANSACTION: + transactionSupport = "local"; + break; + case NO_TRANSACTION: + transactionSupport = "none"; + break; + case XA_TRANSACTION: + transactionSupport = "xa"; + break; + } } for (final ConnectionDefinition connection : outbound.getConnectionDefinition()) {
