[jboss-cvs] jboss-seam/src/main/org/jboss/seam ...
Gavin King
gavin.king at jboss.com
Tue Oct 10 21:22:15 EDT 2006
User: gavin
Date: 06/10/10 21:22:15
Modified: src/main/org/jboss/seam Component.java
InterceptionType.java
Log:
quick workaround for JBSEAM-401
workaround a bug in EJB3
Revision Changes Path
1.186 +3 -4 jboss-seam/src/main/org/jboss/seam/Component.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Component.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/Component.java,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -b -r1.185 -r1.186
--- Component.java 10 Oct 2006 22:30:39 -0000 1.185
+++ Component.java 11 Oct 2006 01:22:15 -0000 1.186
@@ -10,7 +10,6 @@
import static org.jboss.seam.ComponentType.JAVA_BEAN;
import static org.jboss.seam.ComponentType.MESSAGE_DRIVEN_BEAN;
import static org.jboss.seam.ComponentType.STATEFUL_SESSION_BEAN;
-import static org.jboss.seam.ComponentType.STATELESS_SESSION_BEAN;
import static org.jboss.seam.ScopeType.APPLICATION;
import static org.jboss.seam.ScopeType.CONVERSATION;
import static org.jboss.seam.ScopeType.EVENT;
@@ -110,7 +109,7 @@
*
* @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
* @author Gavin King
- * @version $Revision: 1.185 $
+ * @version $Revision: 1.186 $
*/
@Scope(ScopeType.APPLICATION)
public class Component
@@ -691,7 +690,7 @@
{
addInterceptor( new Interceptor( new TransactionInterceptor(), this ) );
}
- if ( getType()!=STATELESS_SESSION_BEAN )
+ if ( getScope()!=STATELESS && getScope()!=EVENT )
{
addInterceptor( new Interceptor( new ManagedEntityIdentityInterceptor(), this ) );
}
@@ -1671,7 +1670,7 @@
{
log.debug("trying to inject with hierarchical context search: " + name);
}
- result = getInstance( name, in.create() );
+ result = getInstance( name, in.create() && !org.jboss.seam.contexts.Lifecycle.isDestroying() );
}
else
{
1.5 +2 -2 jboss-seam/src/main/org/jboss/seam/InterceptionType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InterceptionType.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/InterceptionType.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- InterceptionType.java 25 Jul 2006 19:51:43 -0000 1.4
+++ InterceptionType.java 11 Oct 2006 01:22:15 -0000 1.5
@@ -1,4 +1,4 @@
-//$Id: InterceptionType.java,v 1.4 2006/07/25 19:51:43 gavin Exp $
+//$Id: InterceptionType.java,v 1.5 2006/10/11 01:22:15 gavin Exp $
package org.jboss.seam;
import javax.faces.event.PhaseId;
@@ -47,7 +47,7 @@
public boolean isActive()
{
- if ( Lifecycle.isDestroying() ) return false;
+ //if ( Lifecycle.isDestroying() ) return false;
final PhaseId phaseId = Lifecycle.getPhaseId();
switch(this)
{
More information about the jboss-cvs-commits
mailing list