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

[Gavin King]

  User: gavin   
  Date: 07/07/16 11:48:16

  Modified:    src/main/org/jboss/seam/international  LocaleSelector.java
  Log:
  don't blow up when no event context active
  
  Revision  Changes    Path
  1.8       +7 -3      jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LocaleSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/international/LocaleSelector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- LocaleSelector.java	10 Jul 2007 16:46:58 -0000	1.7
  +++ LocaleSelector.java	16 Jul 2007 15:48:16 -0000	1.8
  @@ -156,11 +156,15 @@
            return facesContext.getApplication().getViewHandler().calculateLocale(facesContext);
         }
         
  -      ServletRequest request = ServletContexts.instance().getRequest();
  +      ServletContexts servletContexts = ServletContexts.getInstance();
  +      if (servletContexts!=null)
  +      {
  +         ServletRequest request = servletContexts.getRequest();
         if (request!=null)
         {
            return calculateLocale( request.getLocale() );
         }
  +      }
   
         return calculateLocale( Locale.getDefault() );
      }