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 17:54:23 UTC

svn commit: r231273 - /cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java

Author: sylvain
Date: Wed Aug 10 08:54:19 2005
New Revision: 231273

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

Modified:
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java?rev=231273&r1=231272&r2=231273&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/bean/CocoonWrapper.java Wed Aug 10 08:54:19 2005
@@ -97,7 +97,6 @@
     private LogKitLoggerManager logManager;
     private Cocoon cocoon;
     protected Logger log;
-    private Map attributes = new HashMap();
     private HashMap empty = new HashMap();
 
     private boolean initialized = false;
@@ -472,7 +471,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();
@@ -501,7 +500,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
@@ -538,7 +537,7 @@
 
         FileSavingEnvironment env =
             new FileSavingEnvironment(deparameterizedURI, lastModified, context,
-                                      attributes, parameters, links,
+                                      null, parameters, links,
                                       gatheredLinks, cliContext, null, log);
 
         XMLConsumer consumer = new ContentHandlerWrapper(handler);
@@ -584,7 +583,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);