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

[Gavin King]

  User: gavin   
  Date: 06/11/16 17:58:13

  Modified:    src/main/org/jboss/seam/interceptors  
                        ConversationInterceptor.java
                        ConversationalInterceptor.java
  Log:
  JBSEAM-493
  
  Revision  Changes    Path
  1.54      +1 -8      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.53
  retrieving revision 1.54
  diff -u -b -r1.53 -r1.54
  --- ConversationInterceptor.java	1 Nov 2006 02:54:02 -0000	1.53
  +++ ConversationInterceptor.java	16 Nov 2006 22:58:13 -0000	1.54
  @@ -1,11 +1,9 @@
  -//$Id: ConversationInterceptor.java,v 1.53 2006/11/01 02:54:02 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.54 2006/11/16 22:58:13 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
   import java.util.Arrays;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   import org.jboss.seam.annotations.AroundInvoke;
   import org.jboss.seam.annotations.Begin;
   import org.jboss.seam.annotations.BeginTask;
  @@ -34,8 +32,6 @@
   public class ConversationInterceptor extends AbstractInterceptor
   {
   
  -   private static final Log log = LogFactory.getLog(ConversationInterceptor.class);
  -
      @AroundInvoke
      public Object endOrBeginLongRunningConversation(InvocationContext invocation) throws Exception
      {
  @@ -183,13 +179,11 @@
      {
         if ( !Manager.instance().isLongRunningConversation() )
         {
  -         log.debug("Beginning long-running conversation");
            Manager.instance().beginConversation( getComponent().getName() );
            beginNavigation(pageflowName);
         }
         else if (nested)
         {
  -         log.debug("Beginning nested conversation");
            Manager.instance().beginNestedConversation( getComponent().getName() );
            beginNavigation(pageflowName);
         }
  @@ -242,7 +236,6 @@
   
      private void endConversation(boolean beforeRedirect)
      {
  -      log.debug("Ending long-running conversation");
         Manager.instance().endConversation(beforeRedirect);
      }
   
  
  
  
  1.9       +2 -1      jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationalInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/interceptors/ConversationalInterceptor.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ConversationalInterceptor.java	1 Nov 2006 02:54:02 -0000	1.8
  +++ ConversationalInterceptor.java	16 Nov 2006 22:58:13 -0000	1.9
  @@ -1,4 +1,4 @@
  -//$Id: ConversationalInterceptor.java,v 1.8 2006/11/01 02:54:02 gavin Exp $
  +//$Id: ConversationalInterceptor.java,v 1.9 2006/11/16 22:58:13 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -120,6 +120,7 @@
         return getComponent().getBeanClass().getAnnotation(Conversational.class).initiator();
      }
   
  +   @SuppressWarnings("deprecation")
      private boolean componentIsInitiator()
      {
         return getComponent().getName().equals( Manager.instance().getCurrentConversationInitiator() );