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

[Gavin King]

  User: gavin   
  Date: 06/10/10 17:00:53

  Modified:    src/main/org/jboss/seam/interceptors 
                        ConversationInterceptor.java
  Log:
  long overdue refactoring
  
  Revision  Changes    Path
  1.50      +3 -2      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationInterceptor.java,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -b -r1.49 -r1.50
  --- ConversationInterceptor.java	10 Oct 2006 06:43:16 -0000	1.49
  +++ ConversationInterceptor.java	10 Oct 2006 21:00:53 -0000	1.50
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.49 2006/10/10 06:43:16 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.50 2006/10/10 21:00:53 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -17,6 +17,7 @@
   import org.jboss.seam.annotations.Interceptor;
   import org.jboss.seam.annotations.StartTask;
   import org.jboss.seam.core.Conversation;
  +import org.jboss.seam.core.ConversationEntries;
   import org.jboss.seam.core.ConversationEntry;
   import org.jboss.seam.core.Interpolator;
   import org.jboss.seam.core.Manager;
  @@ -83,7 +84,7 @@
         if ( id!=null && !"".equals(id) )
         {
            id = Interpolator.instance().interpolate(id);
  -         ConversationEntry ce = Manager.instance().getConversationIdEntryMap().get(id);
  +         ConversationEntry ce = ConversationEntries.instance().getConversationEntry(id);
            if (ce==null) 
            {
               Manager.instance().updateCurrentConversationId(id);