cziegeler 01/10/10 02:25:50
Modified: src/org/apache/cocoon/generation ServerPagesGenerator.java
Log:
NPE fix in certain conditions in ServerPagesGenerator.java
Submitted by: Ovidiu Predescu [EMAIL PROTECTED]
Revision Changes Path
1.17 +55 -28
xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java
Index: ServerPagesGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/org/apache/cocoon/generation/ServerPagesGenerator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ServerPagesGenerator.java 2001/10/08 20:03:17 1.16
+++ ServerPagesGenerator.java 2001/10/10 09:25:50 1.17
@@ -7,31 +7,56 @@
*****************************************************************************/
package org.apache.cocoon.generation;
-import org.apache.avalon.excalibur.pool.Recyclable;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.ResourceNotFoundException;
-import org.apache.cocoon.caching.CacheValidity;
-import org.apache.cocoon.caching.Cacheable;
-import org.apache.cocoon.caching.CompositeCacheValidity;
-import org.apache.cocoon.caching.ParametersCacheValidity;
-import org.apache.cocoon.components.language.generator.ProgramGenerator;
-import org.apache.cocoon.components.language.markup.xsp.XSPGenerator;
-import org.apache.cocoon.environment.Source;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.util.HashUtil;
-import org.apache.cocoon.xml.XMLConsumer;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedList;
+import org.apache.avalon.excalibur.pool.Recyclable;
+
+import org.apache.avalon.framework.activity.Disposable;
+
+import org.apache.avalon.framework.component.Component;
+
+import org.apache.avalon.framework.component.ComponentException;
+
+import org.apache.avalon.framework.component.ComponentManager;
+
+import org.apache.avalon.framework.parameters.Parameters;
+
+import org.apache.cocoon.ProcessingException;
+
+import org.apache.cocoon.ResourceNotFoundException;
+
+import org.apache.cocoon.caching.CacheValidity;
+
+import org.apache.cocoon.caching.Cacheable;
+
+import org.apache.cocoon.caching.CompositeCacheValidity;
+
+import org.apache.cocoon.caching.ParametersCacheValidity;
+
+import org.apache.cocoon.components.language.generator.ProgramGenerator;
+
+import org.apache.cocoon.components.language.markup.xsp.XSPGenerator;
+
+import org.apache.cocoon.environment.Source;
+
+import org.apache.cocoon.environment.SourceResolver;
+
+import org.apache.cocoon.util.HashUtil;
+
+import org.apache.cocoon.xml.XMLConsumer;
+
+import org.xml.sax.Attributes;
+
+import org.xml.sax.Locator;
+
+import org.xml.sax.SAXException;
+
+
+
+import java.io.IOException;
+
+import java.util.HashMap;
+
+import java.util.LinkedList;
+
import java.util.Map;
/**
@@ -39,7 +64,7 @@
* delegating actual SAX event generation.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ricardo Rocha</a>
- * @version CVS $Revision: 1.16 $ $Date: 2001/10/08 20:03:17 $
+ * @version CVS $Revision: 1.17 $ $Date: 2001/10/10 09:25:50 $
*/
public class ServerPagesGenerator
extends ServletGenerator
@@ -441,8 +466,10 @@
if (generator != null)
programGenerator.release(generator);
this.generator = null;
- this.inputSource.recycle();
- this.inputSource = null;
+ if (this.inputSource != null) {
+ this.inputSource.recycle();
+ this.inputSource = null;
+ }
this.eventStack.clear();
}
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
