cziegeler 2003/02/06 07:13:22
Modified: src/java/org/apache/cocoon/environment Environment.java
AbstractEnvironment.java
src/java/org/apache/cocoon/environment/wrapper
EnvironmentWrapper.java
Log:
Fixing severe NPE in the core - I'm really wondering why this hasn't occured earlier
Revision Changes Path
1.18 +7 -1
xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java
Index: Environment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/Environment.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Environment.java 31 Jan 2003 22:51:44 -0000 1.17
+++ Environment.java 6 Feb 2003 15:13:21 -0000 1.18
@@ -104,6 +104,12 @@
org.apache.excalibur.source.SourceResolver getSourceResolver();
/**
+ * Get the <code>XMLizer</code>
+ * This is an internal method, use it at your own risk!
+ */
+ XMLizer getXMLizer();
+
+ /**
* Get the URI to process. The prefix is stripped off.
*/
String getURI();
1.39 +9 -1
xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
Index: AbstractEnvironment.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/AbstractEnvironment.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- AbstractEnvironment.java 2 Feb 2003 23:19:43 -0000 1.38
+++ AbstractEnvironment.java 6 Feb 2003 15:13:21 -0000 1.39
@@ -215,6 +215,14 @@
return this.sourceResolver;
}
+ /**
+ * Get the <code>XMLizer</code>
+ * This is an internal method, use it at your own risk!
+ */
+ public XMLizer getXMLizer() {
+ return this.xmlizer;
+ }
+
// Sitemap methods
/**
1.27 +2 -2
xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- EnvironmentWrapper.java 31 Jan 2003 22:51:45 -0000 1.26
+++ EnvironmentWrapper.java 6 Feb 2003 15:13:22 -0000 1.27
@@ -146,7 +146,7 @@
boolean rawMode)
throws MalformedURLException {
super(env.getURI(), env.getView(), env.getRootContext(), env.getAction());
- this.setComponents(env.getSourceResolver(), null);
+ this.setComponents(env.getSourceResolver(), env.getXMLizer());
this.enableLogging(logger);
this.environment = env;
this.manager = manager;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
