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

[Gavin King]

  User: gavin   
  Date: 07/05/18 21:10:55

  Modified:    src/main/org/jboss/seam/jbpm  SeamVariableResolver.java
  Log:
  JBSEAM-1334
  
  Revision  Changes    Path
  1.4       +16 -3     jboss-seam/src/main/org/jboss/seam/jbpm/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/jbpm/SeamVariableResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SeamVariableResolver.java	30 Nov 2006 02:09:10 -0000	1.3
  +++ SeamVariableResolver.java	19 May 2007 01:10:55 -0000	1.4
  @@ -4,14 +4,22 @@
   import org.jboss.seam.core.Init;
   import org.jbpm.jpdl.el.ELException;
   import org.jbpm.jpdl.el.VariableResolver;
  +import org.jbpm.jpdl.el.impl.JbpmVariableResolver;
   
  -public class SeamVariableResolver implements VariableResolver {
  +public class SeamVariableResolver implements VariableResolver 
  +{
   
  -	public Object resolveVariable(String name) throws ELException {
  +   private VariableResolver jbpmVariableResolver = new JbpmVariableResolver();
  +
  +	public Object resolveVariable(String name) throws ELException 
  +   {
   	   name = name.replace('$', '.');
   	   Object instance = Component.getInstance(name, true);
         if (instance==null)
         {
  +         instance = jbpmVariableResolver.resolveVariable(name);
  +         if (instance==null)
  +         {
            return Init.instance().getRootNamespace().getChild(name);
         }
         else
  @@ -19,5 +27,10 @@
            return instance;
         }
   	}
  +      else
  +      {
  +         return instance;
  +      }
  +	}
   
   }