You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by lg...@apache.org on 2006/08/23 10:48:32 UTC
svn commit: r433980 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Author: lgawron
Date: Wed Aug 23 01:48:32 2006
New Revision: 433980
URL: http://svn.apache.org/viewvc?rev=433980&view=rev
Log:
looks like potential NPE to me
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java?rev=433980&r1=433979&r2=433980&view=diff
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/TemplateObjectModelHelper.java Wed Aug 23 01:48:32 2006
@@ -25,7 +25,10 @@
import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.Processor;
import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.configuration.Settings;
+import org.apache.cocoon.environment.internal.EnvironmentHelper;
import org.apache.commons.jxpath.DynamicPropertyHandler;
import org.apache.commons.jxpath.JXPathBeanInfo;
import org.apache.commons.jxpath.JXPathIntrospector;
@@ -115,12 +118,12 @@
// cocoon.continuation
final Object cont = FlowHelper.getWebContinuation(objectModel);
- if ( cont != null ) {
+ if (cont != null) {
cocoon.put("continuation", cont);
}
// cocoon.parameters
- if ( parameters != null ) {
+ if (parameters != null) {
cocoon.put("parameters", new ParametersMap(parameters));
}
@@ -137,7 +140,7 @@
return map;
}
-
+
protected static final class ParametersMap extends Parameters implements Map {
protected final Parameters wrappedParameters;
@@ -246,11 +249,11 @@
}
public boolean containsValue(Object arg0) {
- return this.map.containsValue(arg0);
+ return this.getMap().containsValue(arg0);
}
public Set entrySet() {
- return this.map.entrySet();
+ return this.getMap().entrySet();
}
public Object get(Object arg0) {