[jboss-cvs] jboss-seam/src/main/org/jboss/seam/core ...

[Gavin King]

  User: gavin   
  Date: 07/06/20 11:53:32

  Modified:    src/main/org/jboss/seam/core   Init.java Manager.java
  Log:
  nested->toplevel
  get rid of client-side conversation support
  
  Revision  Changes    Path
  1.49      +4 -4      jboss-seam/src/main/org/jboss/seam/core/Init.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Init.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Init.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -b -r1.48 -r1.49
  --- Init.java	15 Jun 2007 07:24:56 -0000	1.48
  +++ Init.java	20 Jun 2007 15:53:32 -0000	1.49
  @@ -1,4 +1,4 @@
  -//$Id: Init.java,v 1.48 2007/06/15 07:24:56 gavin Exp $
  +//$Id: Init.java,v 1.49 2007/06/20 15:53:32 gavin Exp $
   package org.jboss.seam.core;
   
   
  @@ -41,7 +41,7 @@
      
      private Namespace rootNamespace = new Namespace(null);
      
  -   private boolean isClientSideConversations = false;
  +   //private boolean isClientSideConversations = false;
      private boolean jbpmInstalled;
      private String jndiPattern;
      private boolean debug;
  @@ -97,7 +97,7 @@
         return init;
      }
      
  -   public boolean isClientSideConversations()
  +   /*public boolean isClientSideConversations()
      {
         return isClientSideConversations;
      }
  @@ -105,7 +105,7 @@
      public void setClientSideConversations(boolean isClientSideConversations)
      {
         this.isClientSideConversations = isClientSideConversations;
  -   }
  +   }*/
      
      public static class FactoryMethod {
   	   private Method method;
  
  
  
  1.176     +3 -3      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.175
  retrieving revision 1.176
  diff -u -b -r1.175 -r1.176
  --- Manager.java	20 Jun 2007 05:34:31 -0000	1.175
  +++ Manager.java	20 Jun 2007 15:53:32 -0000	1.176
  @@ -325,14 +325,14 @@
            removeCurrentConversationAndDestroyNestedContexts(session);
         }
   
  -      if ( !Init.instance().isClientSideConversations() ) 
  -      {
  +      /*if ( !Init.instance().isClientSideConversations() ) 
  +      {*/
            // difficult question: is it really safe to do this here?
            // right now we do have to do it after committing the Seam
            // transaction because we can't close EMs inside a txn
            // (this might be a bug in HEM)
            Manager.instance().conversationTimeout(session);
  -      }
  +      //}
      }
      
      public void unlockConversation()