User: fleury
Date: 00/07/27 17:25:18
Modified: src/main/org/jboss/ejb/plugins
EntitySynchronizationInterceptor.java
Log:
Fixing the tx stuff
Revision Changes Path
1.7 +5 -3
jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java
Index: EntitySynchronizationInterceptor.java
===================================================================
RCS file:
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/EntitySynchronizationInterceptor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EntitySynchronizationInterceptor.java 2000/06/21 11:51:31 1.6
+++ EntitySynchronizationInterceptor.java 2000/07/28 00:25:18 1.7
@@ -47,7 +47,7 @@
*
* @see <related>
* @author Rickard �berg ([EMAIL PROTECTED])
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class EntitySynchronizationInterceptor
extends AbstractInterceptor
@@ -151,7 +151,8 @@
EnterpriseContext ctx = mi.getEnterpriseContext();
if (ctx.getId() != null)
{
- if (mi.getTransaction().getStatus() ==
Status.STATUS_ACTIVE)
+ if (mi.getTransaction() != null &&
+ mi.getTransaction().getStatus() ==
Status.STATUS_ACTIVE)
{
// Set tx
register(ctx, mi.getTransaction());
@@ -174,7 +175,8 @@
//DEBUG Logger.debug("TX:"+(current.getStatus() == Status.STATUS_ACTIVE));
- if (current.getStatus() == Status.STATUS_ACTIVE)
+ if (current != null &&
+ current.getStatus() == Status.STATUS_ACTIVE)
{
// Synchronize with DB
if (!ctx.isSynchronized())
