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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/web    Locale.java Parameters.java
                        ServletContexts.java
  Log:
  don't blow up when no event context active
  
  Revision  Changes    Path
  1.2       +2 -1      jboss-seam/src/main/org/jboss/seam/web/Locale.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Locale.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/Locale.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- Locale.java	10 Jul 2007 10:23:21 -0000	1.1
  +++ Locale.java	16 Jul 2007 15:48:16 -0000	1.2
  @@ -27,7 +27,8 @@
      @Unwrap @Override
      public java.util.Locale getLocale()
      {
  -      ServletRequest request = ServletContexts.instance().getRequest();
  +      ServletContexts servletContexts = ServletContexts.getInstance();
  +      ServletRequest request = servletContexts==null ? null : servletContexts.getRequest();
         return request==null ? super.getLocale() : request.getLocale();
      }
      
  
  
  
  1.5       +7 -3      jboss-seam/src/main/org/jboss/seam/web/Parameters.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Parameters.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/Parameters.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Parameters.java	21 Jun 2007 05:27:29 -0000	1.4
  +++ Parameters.java	16 Jul 2007 15:48:16 -0000	1.5
  @@ -36,11 +36,15 @@
   
      public Map<String, String[]> getRequestParameters()
      {
  -      ServletRequest servletRequest = ServletContexts.instance().getRequest();
  -      if ( servletRequest != null )
  +      ServletContexts servletContexts = ServletContexts.getInstance();
  +      if ( servletContexts!=null )
  +      {
  +         ServletRequest servletRequest = servletContexts.getRequest();
  +         if ( servletRequest!=null )
         {
            return servletRequest.getParameterMap();
         }
  +      }
         return Collections.EMPTY_MAP;
      }
   
  
  
  
  1.4       +6 -0      jboss-seam/src/main/org/jboss/seam/web/ServletContexts.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServletContexts.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/web/ServletContexts.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- ServletContexts.java	20 Jun 2007 17:45:58 -0000	1.3
  +++ ServletContexts.java	16 Jul 2007 15:48:16 -0000	1.4
  @@ -42,6 +42,12 @@
         return (ServletContexts) Component.getInstance(ServletContexts.class, ScopeType.EVENT);
      }
   
  +   public static ServletContexts getInstance()
  +   {
  +      return Contexts.isEventContextActive() ? 
  +               (ServletContexts) Component.getInstance(ServletContexts.class, ScopeType.EVENT) : null;
  +   }
  +
      public HttpServletRequest getRequest()
      {
         return request;