You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2008/04/02 09:50:11 UTC
svn commit: r643778 -
/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
Author: dblevins
Date: Wed Apr 2 00:50:08 2008
New Revision: 643778
URL: http://svn.apache.org/viewvc?rev=643778&view=rev
Log:
Merging r643762 - http://svn.apache.org/viewvc?rev=643762&view=rev
svn merge -r 643761:643762 https://svn.apache.org/repos/asf/openejb/trunk/openejb3 .
------------------------------------------------------------------------
r643762 | dblevins | 2008-04-02 00:02:23 -0700 (Wed, 02 Apr 2008) | 1 line
Check for a null xaResource before attempting to wrap
------------------------------------------------------------------------
Modified:
openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
Modified: openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java
URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java?rev=643778&r1=643777&r2=643778&view=diff
==============================================================================
--- openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java (original)
+++ openejb/branches/openejb-3.0/container/openejb-core/src/main/java/org/apache/openejb/core/mdb/EndpointFactory.java Wed Apr 2 00:50:08 2008
@@ -58,7 +58,7 @@
}
public MessageEndpoint createEndpoint(XAResource xaResource) throws UnavailableException {
- if (txRecovery) {
+ if (txRecovery && xaResource != null) {
xaResource = new WrapperNamedXAResource(xaResource, container.getContainerID().toString());
}
EndpointHandler endpointHandler = new EndpointHandler(container, deploymentInfo, instanceFactory, xaResource);