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/11/07 14:30:20 UTC
cvs commit: cocoon-2.2/src/java/org/apache/cocoon Cocoon.java
cziegeler 2003/11/07 05:30:20
Modified: src/java/org/apache/cocoon Cocoon.java
Log:
Making precompilation work again...
Revision Changes Path
1.29 +8 -3 cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java
Index: Cocoon.java
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/java/org/apache/cocoon/Cocoon.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Cocoon.java 30 Oct 2003 12:20:45 -0000 1.28
+++ Cocoon.java 7 Nov 2003 13:30:20 -0000 1.29
@@ -369,7 +369,7 @@
throw new IllegalStateException("You cannot process a Disposed Cocoon engine.");
}
-// Object key = CocoonComponentManager.startProcessing(environment);
+ Object key = EnvironmentHelper.startProcessing(environment);
EnvironmentHelper.enterProcessor(this, this.serviceManager, environment);
try {
boolean result;
@@ -396,7 +396,7 @@
throw any;
} finally {
EnvironmentHelper.leaveProcessor();
-// CocoonComponentManager.endProcessing(environment, key);
+ EnvironmentHelper.endProcessing(environment, key);
if (getLogger().isDebugEnabled()) {
--activeRequestCount;
}
@@ -469,6 +469,9 @@
throws Exception {
ProgramGenerator programGenerator = null;
Source source = null;
+ Object key = EnvironmentHelper.startProcessing(environment);
+ EnvironmentHelper.enterProcessor(this, this.serviceManager, environment);
+
try {
if (getLogger().isDebugEnabled()) {
getLogger().debug("XSP generation begin:" + fileName);
@@ -484,6 +487,8 @@
}
*/
} finally {
+ EnvironmentHelper.leaveProcessor();
+ EnvironmentHelper.endProcessing(environment, key);
this.sourceResolver.release(source);
this.serviceManager.release(programGenerator);
}