From: Gavin K. <gav...@jb...> - 2006-04-02 23:50:28
|
User: gavin Date: 06/04/02 19:50:18 Modified: src/main/org/jboss/seam/core Manager.java Log: s:actionLink renamed to s:link enhanced s:link added s:taskId Revision Changes Path 1.47 +6 -2 jboss-seam/src/main/org/jboss/seam/core/Manager.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Manager.java =================================================================== RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v retrieving revision 1.46 retrieving revision 1.47 diff -u -b -r1.46 -r1.47 --- Manager.java 31 Mar 2006 15:14:28 -0000 1.46 +++ Manager.java 2 Apr 2006 23:50:18 -0000 1.47 @@ -39,7 +39,7 @@ * * @author Gavin King * @author <a href="mailto:th...@jb...">Thomas Heute</a> - * @version $Revision: 1.46 $ + * @version $Revision: 1.47 $ */ @Scope(ScopeType.EVENT) @Name("org.jboss.seam.core.manager") @@ -456,7 +456,7 @@ Pageflow.instance().begin( propagation.substring(6) ); } } - if ( propagation!=null && propagation.startsWith("join") ) + else if ( propagation!=null && propagation.startsWith("join") ) { if ( !isLongRunningConversation ) { @@ -475,6 +475,10 @@ Pageflow.instance().begin( propagation.substring(5) ); } } + else if ( "end".equals(propagation) ) + { + endConversation(); + } } |