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

[Gavin King]

  User: gavin   
  Date: 07/07/10 04:57:36

  Modified:    src/main/org/jboss/seam/bpm  SeamVariableResolver.java
  Log:
  JBSEAM-1606, JBSEAM 1632
  
  Revision  Changes    Path
  1.2       +18 -10    jboss-seam/src/main/org/jboss/seam/bpm/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/bpm/SeamVariableResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamVariableResolver.java	20 Jun 2007 05:34:31 -0000	1.1
  +++ SeamVariableResolver.java	10 Jul 2007 08:57:36 -0000	1.2
  @@ -1,13 +1,14 @@
   package org.jboss.seam.bpm;
   
   import org.jboss.seam.Component;
  +import org.jboss.seam.contexts.Contexts;
   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;
   
   /**
  - * Resolves Seam variables for jBPM.
  + * Resolves Seam context variables for jBPM.
    * 
    * @author Gavin King
    *
  @@ -19,8 +20,14 @@
   
   	public Object resolveVariable(String name) throws ELException 
      {
  -	   name = name.replace('$', '.');
  -	   Object instance = Component.getInstance(name, true);
  +      if ( !Contexts.isApplicationContextActive() )
  +      {
  +         //if no Seam contexts, bypass straight through to jBPM
  +         return jbpmVariableResolver.resolveVariable(name);
  +      }
  +      else
  +      {
  +   	   Object instance = Component.getInstance(name);
         if (instance==null)
         {
            instance = jbpmVariableResolver.resolveVariable(name);
  @@ -38,5 +45,6 @@
            return instance;
         }
   	}
  +	}
   
   }