You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/10/27 08:32:00 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper MutableEnvironmentFacade.java
cziegeler 2003/10/26 23:32:00
Modified: src/java/org/apache/cocoon/environment/wrapper
MutableEnvironmentFacade.java
Log:
This fixes the NPE recently found in the chaperon examples.
The problem is that after a getInputStream/toSAX to a SitemapSource,
this method couldn't be called a second time.
Uncommenting this line from the reset() method solves *this* problem,
but does it create new ones?
(I'm really glad that we can trash all this in 2.2)
Revision Changes Path
1.5 +6 -2 cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
Index: MutableEnvironmentFacade.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MutableEnvironmentFacade.java 19 Oct 2003 16:21:28 -0000 1.4
+++ MutableEnvironmentFacade.java 27 Oct 2003 07:32:00 -0000 1.5
@@ -119,7 +119,11 @@
public void reset() {
this.env.reset();
- this.env.setURI(this.uri, this.prefix);
+ // TODO - If we remove the line below, do we break something
+ // else again? If we leave it in, the SitemapSource
+ // object is unusable after a call to getInputStream()
+ // or toSAX() :(
+ //this.env.setURI(this.uri, this.prefix);
}
//----------------------------------