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

[Gavin King]

  User: gavin   
  Date: 06/10/10 18:09:05

  Modified:    src/main/org/jboss/seam/remoting   ExecutionHandler.java
                        SubscriptionHandler.java
  Log:
  single concurrent request per conversation model JBSEAM-335, JBSEAM-183
  
  Revision  Changes    Path
  1.16      +1 -1      jboss-seam/src/main/org/jboss/seam/remoting/ExecutionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExecutionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/ExecutionHandler.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- ExecutionHandler.java	5 Jul 2006 01:49:05 -0000	1.15
  +++ ExecutionHandler.java	10 Oct 2006 22:09:05 -0000	1.16
  @@ -75,7 +75,7 @@
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest(servletContext, session, request);
   
  -      Manager.instance().restoreConversation( ctx.getConversationId(), false );
  +      Manager.instance().restoreAndLockConversation( ctx.getConversationId(), false );
         Lifecycle.resumeConversation(session);
   
         // Extract the calls from the request
  
  
  
  1.8       +1 -1      jboss-seam/src/main/org/jboss/seam/remoting/SubscriptionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SubscriptionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/SubscriptionHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- SubscriptionHandler.java	30 Jun 2006 18:53:56 -0000	1.7
  +++ SubscriptionHandler.java	10 Oct 2006 22:09:05 -0000	1.8
  @@ -70,7 +70,7 @@
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest(servletContext, session, request);
   
  -      Manager.instance().restoreConversation( (String) null, false );
  +      Manager.instance().restoreAndLockConversation( (String) null, false );
         Lifecycle.resumeConversation(session);
   
         for (SubscriptionRequest req : requests)