[jboss-cvs] jboss-seam/src/main/org/jboss/seam/interceptors ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 01:34:32 EDT 2007
User: gavin
Date: 07/06/20 01:34:32
Modified: src/main/org/jboss/seam/interceptors
ConversationInterceptor.java
ManagedEntityIdentityInterceptor.java
Log:
reorg pageflow stuff
make some things package-private
Revision Changes Path
1.66 +2 -2 jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConversationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- ConversationInterceptor.java 19 Jun 2007 19:02:34 -0000 1.65
+++ ConversationInterceptor.java 20 Jun 2007 05:34:32 -0000 1.66
@@ -1,4 +1,4 @@
-//$Id: ConversationInterceptor.java,v 1.65 2007/06/19 19:02:34 gavin Exp $
+//$Id: ConversationInterceptor.java,v 1.66 2007/06/20 05:34:32 gavin Exp $
package org.jboss.seam.interceptors;
import java.lang.reflect.Method;
@@ -18,7 +18,7 @@
import org.jboss.seam.core.Interpolator;
import org.jboss.seam.core.Manager;
import org.jboss.seam.intercept.InvocationContext;
-import org.jboss.seam.navigation.Pageflow;
+import org.jboss.seam.pageflow.Pageflow;
import org.jboss.seam.persistence.PersistenceContexts;
/**
1.28 +14 -4 jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ManagedEntityIdentityInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ManagedEntityIdentityInterceptor.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- ManagedEntityIdentityInterceptor.java 19 Jun 2007 19:02:34 -0000 1.27
+++ ManagedEntityIdentityInterceptor.java 20 Jun 2007 05:34:32 -0000 1.28
@@ -13,9 +13,9 @@
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Interceptor;
import org.jboss.seam.contexts.Contexts;
-import org.jboss.seam.contexts.PassivatedEntity;
import org.jboss.seam.intercept.InvocationContext;
import org.jboss.seam.persistence.PersistenceContexts;
+import org.jboss.seam.transaction.Transaction;
import org.jboss.seam.util.Reflections;
/**
@@ -24,8 +24,6 @@
* bean or Seam-managed extended persistence context, and allowing
* for more efficient replication.
*
- * @see org.jboss.seam.contexts.PassivatedEntity
- *
* @author Gavin King
*
*/
@@ -45,13 +43,25 @@
}
finally
{
- if ( !PassivatedEntity.isTransactionRolledBackOrMarkedRollback() )
+ if ( !isTransactionRolledBackOrMarkedRollback() )
{
entityRefsToIds(ctx);
}
}
}
+ private static boolean isTransactionRolledBackOrMarkedRollback()
+ {
+ try
+ {
+ return Transaction.instance().isRolledBackOrMarkedRollback();
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
+
public void entityRefsToIds(InvocationContext ctx) throws Exception
{
if ( touchedContextsExist() )
More information about the jboss-cvs-commits
mailing list