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

[Gavin King]

  User: gavin   
  Date: 07/01/17 14:25:12

  Modified:    src/main/org/jboss/seam/jsf   SeamELResolver.java
                        SeamVariableResolver.java
  Log:
  dont blow up when no seam contexts active
  
  Revision  Changes    Path
  1.5       +7 -0      jboss-seam/src/main/org/jboss/seam/jsf/SeamELResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamELResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamELResolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SeamELResolver.java	15 Dec 2006 07:18:18 -0000	1.4
  +++ SeamELResolver.java	17 Jan 2007 19:25:12 -0000	1.5
  @@ -9,6 +9,7 @@
   import javax.faces.model.DataModel;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Init;
   
   public class SeamELResolver extends ELResolver
  @@ -37,6 +38,12 @@
      {
         if (base==null)
         {
  +         if ( !Contexts.isApplicationContextActive() )
  +         {
  +            //if no Seam contexts, bypass straight through to JSF
  +            return null;
  +         }
  +         
            String name = (String) property;
            name = name.replace('$', '.');
            Object result = Component.getInstance(name);
  
  
  
  1.19      +8 -1      jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamVariableResolver.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamVariableResolver.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -b -r1.18 -r1.19
  --- SeamVariableResolver.java	16 Dec 2006 02:58:11 -0000	1.18
  +++ SeamVariableResolver.java	17 Jan 2007 19:25:12 -0000	1.19
  @@ -14,6 +14,7 @@
   import org.jboss.seam.log.LogProvider;
   import org.jboss.seam.log.Logging;
   import org.jboss.seam.Component;
  +import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Init;
   
   /**
  @@ -23,7 +24,7 @@
    * 
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.18 $
  + * @version $Revision: 1.19 $
    */
   public class SeamVariableResolver extends VariableResolver
   {
  @@ -40,6 +41,12 @@
      @Override
      public Object resolveVariable(FacesContext facesContext, String name) throws EvaluationException
      {
  +      if ( !Contexts.isApplicationContextActive() )
  +      {
  +         //if no Seam contexts, bypass straight through to JSF
  +         return jsfVariableResolver.resolveVariable(facesContext, name);
  +      }
  +      
         name = name.replace('$', '.');
         
         log.debug("resolving name: " + name);