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

[Gavin King]

  User: gavin   
  Date: 06/09/26 10:48:46

  Modified:    src/main/org/jboss/seam/core  TouchedContexts.java
  Log:
  fixed bug when no conversation context active
  
  Revision  Changes    Path
  1.2       +10 -2     jboss-seam/src/main/org/jboss/seam/core/TouchedContexts.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TouchedContexts.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/TouchedContexts.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- TouchedContexts.java	23 Sep 2006 15:41:39 -0000	1.1
  +++ TouchedContexts.java	26 Sep 2006 14:48:46 -0000	1.2
  @@ -12,8 +12,9 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
  +import org.jboss.seam.contexts.Contexts;
   
  - at Name("touchedContexts")
  + at Name("org.jboss.seam.core.touchedContexts")
   @Scope(ScopeType.CONVERSATION)
   @Intercept(NEVER)
   @Mutable
  @@ -29,7 +30,14 @@
      
      public static Set<String> instance()
      {
  +      if ( Contexts.isConversationContextActive() )
  +      {
         return (Set<String>) Component.getInstance(TouchedContexts.class);
      }
  +      else
  +      {
  +         return null;
  +      }
  +   }
      
   }