You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/08/10 18:08:24 UTC

svn commit: r231276 - /cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java

Author: sylvain
Date: Wed Aug 10 09:08:20 2005
New Revision: 231276

URL: http://svn.apache.org/viewcvs?rev=231276&view=rev
Log:
Ensure each CLI request starts with an empty attribute map

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java

Modified: cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java?rev=231276&r1=231275&r2=231276&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/bean/CocoonWrapper.java Wed Aug 10 09:08:20 2005
@@ -93,7 +93,6 @@
     private CommandLineContext cliContext;
     private Cocoon cocoon;
     protected Logger log;
-    private Map attributes = new HashMap();
     private HashMap empty = new HashMap();
 
     private boolean initialized = false;
@@ -394,7 +393,7 @@
         parameters.put("accept", accept);
 
         LinkSamplingEnvironment env =
-            new LinkSamplingEnvironment(deparameterizedURI, context, attributes,
+            new LinkSamplingEnvironment(deparameterizedURI, context, null,
                                         parameters, cliContext, log);
         processLenient(env);
         return env.getLinks();
@@ -423,7 +422,7 @@
 
         FileSavingEnvironment env =
             new FileSavingEnvironment(deparameterizedURI, lastModified, context,
-                                      attributes, parameters, links,
+                                      null, parameters, links,
                                       gatheredLinks, cliContext, stream, log);
 
         // Here Cocoon can throw an exception if there are errors in processing the page
@@ -460,7 +459,7 @@
 
         FileSavingEnvironment env =
             new FileSavingEnvironment(deparameterizedURI, lastModified, context,
-                                      attributes, parameters, links,
+                                      null, parameters, links,
                                       gatheredLinks, cliContext, null, log);
 
         XMLConsumer consumer = new ContentHandlerWrapper(handler);
@@ -509,7 +508,7 @@
         parameters.put("accept", accept);
 
         FileSavingEnvironment env =
-            new FileSavingEnvironment(deparameterizedURI, context, attributes,
+            new FileSavingEnvironment(deparameterizedURI, context, null,
                                       parameters, empty, null, cliContext,
                                       new NullOutputStream(), log);
         processLenient(env);