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

[Shane Bryzak]

  User: sbryzak2
  Date: 07/11/29 22:39:46

  Modified:    src/main/org/jboss/seam/core  ConversationInterceptor.java
  Log:
  null check
  
  Revision  Changes    Path
  1.6       +3 -2      jboss-seam/src/main/org/jboss/seam/core/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/core/ConversationInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ConversationInterceptor.java	29 Nov 2007 22:03:54 -0000	1.5
  +++ ConversationInterceptor.java	30 Nov 2007 03:39:46 -0000	1.6
  @@ -1,4 +1,4 @@
  -//$Id: ConversationInterceptor.java,v 1.5 2007/11/29 22:03:54 sbryzak2 Exp $
  +//$Id: ConversationInterceptor.java,v 1.6 2007/11/30 03:39:46 sbryzak2 Exp $
   package org.jboss.seam.core;
   
   import java.lang.reflect.Method;
  @@ -88,7 +88,8 @@
         if ( !Manager.instance().isLongRunningConversation() )
         {
            String id = null;
  -         String conversation = ConversationPropagation.instance().getConversationName();
  +         ConversationPropagation propagation = ConversationPropagation.instance(); 
  +         String conversation = propagation != null ? propagation.getConversationName() : null;
            
            if ( method.isAnnotationPresent(Begin.class) )
            {