You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/01/20 13:37:39 UTC
tomee git commit: TOMEE-1497 patch from Roman Boykov to avoid a NPE
when outbound transactionSupport is null
Repository: tomee
Updated Branches:
refs/heads/develop 9a9efa35b -> 3a2d91542
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/3a2d9154
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3a2d9154
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3a2d9154
Branch: refs/heads/develop
Commit: 3a2d915422c6089890a7f668f73fe968bfdc3944
Parents: 9a9efa3
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue Jan 20 13:36:34 2015 +0100
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue Jan 20 13:37:07 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/3a2d9154/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 cf4c1c8..a8f3d6e 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
@@ -64,6 +64,7 @@ import org.apache.openejb.jee.ResourceAdapter;
import org.apache.openejb.jee.ServiceImplBean;
import org.apache.openejb.jee.Servlet;
import org.apache.openejb.jee.SessionConfig;
+import org.apache.openejb.jee.TransactionSupportType;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.jee.WebserviceDescription;
import org.apache.openejb.jee.Webservices;
@@ -515,16 +516,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()) {