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

[Peter Muir]

  User: pmuir   
  Date: 07/11/15 09:13:53

  Modified:    src/main/org/jboss/seam/core  SeamResourceBundle.java
  Log:
  JBSEAM-2150
  
  Revision  Changes    Path
  1.9       +5 -0      jboss-seam/src/main/org/jboss/seam/core/SeamResourceBundle.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamResourceBundle.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/SeamResourceBundle.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- SeamResourceBundle.java	31 Aug 2007 18:16:43 -0000	1.8
  +++ SeamResourceBundle.java	15 Nov 2007 14:13:53 -0000	1.9
  @@ -10,6 +10,7 @@
   import java.util.ResourceBundle;
   import java.util.concurrent.ConcurrentHashMap;
   
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.navigation.Pages;
   import org.jboss.seam.util.EnumerationEnumeration;
   
  @@ -94,6 +95,10 @@
      @Override
      protected Object handleGetObject(String key)
      {
  +      if (!Contexts.isApplicationContextActive())
  +      {
  +         return null;
  +      }
         List<java.util.ResourceBundle> pageBundles = getPageResourceBundles();
         for (java.util.ResourceBundle pageBundle : pageBundles)
         {