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

[Gavin King]

  User: gavin   
  Date: 07/02/11 14:59:41

  Modified:    src/main/org/jboss/seam/interceptors 
                        ConversationInterceptor.java
  Log:
  selective conversationinterceptor
  
  Revision  Changes    Path
  1.60      +21 -13    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.59
  retrieving revision 1.60
  diff -u -b -r1.59 -r1.60
  --- ConversationInterceptor.java	11 Feb 2007 19:48:12 -0000	1.59
  +++ ConversationInterceptor.java	11 Feb 2007 19:59:41 -0000	1.60
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.59 2007/02/11 19:48:12 gavin Exp $
  +//$Id: ConversationInterceptor.java,v 1.60 2007/02/11 19:59:41 gavin Exp $
   package org.jboss.seam.interceptors;
   
   import java.lang.reflect.Method;
  @@ -37,6 +37,8 @@
      public Object aroundInvoke(InvocationContext invocation) throws Exception
      {
         Method method = invocation.getMethod();
  +      if ( getComponent().isConversationManagementMethod(method) ) //performance optimization 
  +      {
   
         if ( isMissingJoin(method) )
         {
  @@ -54,6 +56,12 @@
            endConversationIfNecessary(method, result);
            return result;
         }
  +         
  +      }
  +      else
  +      {
  +         return invocation.proceed();
  +      }
      }
      
      public boolean redirectToExistingConversation(Method method)