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 2004/01/19 11:47:14 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon/environment/internal EnvironmentHelper.java
cziegeler 2004/01/19 02:47:14
Modified: src/java/org/apache/cocoon/environment/internal
EnvironmentHelper.java
Log:
Avoid NPE
Revision Changes Path
1.2 +7 -4 cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
Index: EnvironmentHelper.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnvironmentHelper.java 10 Jan 2004 14:38:19 -0000 1.1
+++ EnvironmentHelper.java 19 Jan 2004 10:47:14 -0000 1.2
@@ -453,9 +453,12 @@
*/
public static EnvironmentContext getCurrentEnvironmentContext() {
final EnvironmentStack stack = (EnvironmentStack)environmentStack.get();
- final EnvironmentInfo info = stack.getCurrentInfo();
- final Map objectModel = info.environment.getObjectModel();
- return (EnvironmentContext)objectModel.get(PROCESS_KEY);
+ if ( stack != null && !stack.empty() ) {
+ final EnvironmentInfo info = stack.getCurrentInfo();
+ final Map objectModel = info.environment.getObjectModel();
+ return (EnvironmentContext)objectModel.get(PROCESS_KEY);
+ }
+ return null;
}
/**