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

[Gavin King]

  User: gavin   
  Date: 06/09/28 12:43:10

  Modified:    src/main/org/jboss/seam/contexts 
                        ServerConversationContext.java
  Log:
  oops
  
  Revision  Changes    Path
  1.5       +6 -3      jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerConversationContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/ServerConversationContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- ServerConversationContext.java	17 Jun 2006 04:50:25 -0000	1.4
  +++ ServerConversationContext.java	28 Sep 2006 16:43:10 -0000	1.5
  @@ -23,7 +23,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    */
   public class ServerConversationContext implements Context {
   
  @@ -160,8 +160,11 @@
   
      public void flush()
      {
  -      boolean longRunning = Manager.instance().isLongRunningConversation() ||
  -            !Manager.instance().getCurrentConversationId().equals( getId() );
  +      Manager manager = Manager.instance();
  +      boolean longRunning = manager.isLongRunningConversation() ||
  +            //TODO: in some exception cases it seems to be possible for 
  +            //manager.getCurrentConversationId()==null, causing an NPE:
  +            !manager.getCurrentConversationId().equals( getId() );  
         if ( longRunning )
         {
            for (String name: removals)