cvs commit: cocoon-2.1/src/java/org/apache/cocoon/generation JXTemplateGenerator.java

[mpo]

mpo         2003/08/28 07:29:43

  Modified:    src/java/org/apache/cocoon/generation
                        JXTemplateGenerator.java
  Log:
  Making sure the continuation is present in the Jexl context even if the 
flowContext is missing.
  
  Revision  Changes    Path
  1.7       +3 -1      
cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
  
  Index: JXTemplateGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- JXTemplateGenerator.java  11 Aug 2003 12:48:56 -0000      1.6
  +++ JXTemplateGenerator.java  28 Aug 2003 14:29:43 -0000      1.7
  @@ -2662,7 +2662,6 @@
           map = globalJexlContext.getVars();
           if (contextObject != null) {
               map.put("flowContext", contextObject);
  -            map.put("continuation", kont);
               // FIXME (VG): Is this required (what it's used for - examples)?
               // Here I use Rhino's live-connect objects to allow Jexl to call
               // java constructors
  @@ -2670,6 +2669,9 @@
               Object pkgs = JavaScriptFlow.getPackages(objectModel);
               map.put("java", javaPkg);
               map.put("Packages", pkgs);
  +        }
  +        if (kont!=null) {
  +            map.put("continuation", kont);
           }
           map.put("request", request);
           map.put("response", response);