cziegeler 2004/01/27 05:42:12
Modified: src/java/org/apache/cocoon/components/cprocessor/sitemap
RedirectToURINode.java CallFunctionNode.java
ActNode.java
src/java/org/apache/cocoon/components/flow/javascript
JSCocoon.java
src/java/org/apache/cocoon/environment/internal
EnvironmentHelper.java
src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
Log:
Passing in the environment to avoid one lookup
Revision Changes Path
1.4 +2 -2
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/RedirectToURINode.java
Index: RedirectToURINode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/RedirectToURINode.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RedirectToURINode.java 27 Jan 2004 13:27:37 -0000 1.3
+++ RedirectToURINode.java 27 Jan 2004 13:41:38 -0000 1.4
@@ -105,7 +105,7 @@
getLogger().info("Redirecting to '" + resolvedURI + "' at " +
getLocation());
}
- final Redirector redirector = EnvironmentHelper.getRedirector();
+ final Redirector redirector = EnvironmentHelper.getRedirector(env);
if (m_global) {
redirector.globalRedirect(m_createSession, resolvedURI);
1.5 +2 -2
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/CallFunctionNode.java
Index: CallFunctionNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/CallFunctionNode.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CallFunctionNode.java 27 Jan 2004 13:27:40 -0000 1.4
+++ CallFunctionNode.java 27 Jan 2004 13:41:40 -0000 1.5
@@ -152,7 +152,7 @@
}
public boolean invoke(Environment env, InvokeContext context) throws
Exception {
- Redirector redirector = EnvironmentHelper.getRedirector();
+ Redirector redirector = EnvironmentHelper.getRedirector(env);
List params = null;
1.3 +4 -4
cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ActNode.java
Index: ActNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/cprocessor/sitemap/ActNode.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ActNode.java 27 Jan 2004 13:27:43 -0000 1.2
+++ ActNode.java 27 Jan 2004 13:41:42 -0000 1.3
@@ -175,7 +175,7 @@
Map result = m_actionSetNode.call(env, context, resolvedParams);
- if (EnvironmentHelper.getRedirector().hasRedirected()) {
+ if (EnvironmentHelper.getRedirector(env).hasRedirected()) {
return true;
} else if (result == null) {
@@ -194,8 +194,8 @@
// Prepare data needed by the action
Map objectModel = env.getObjectModel();
- Redirector redirector = EnvironmentHelper.getRedirector();
- SourceResolver resolver =
EnvironmentHelper.getSourceResolver();
+ Redirector redirector = EnvironmentHelper.getRedirector(env);
+ SourceResolver resolver =
EnvironmentHelper.getSourceResolver(env);
String resolvedSource = m_source.resolve(context,
objectModel);
Parameters resolvedParams =
VariableResolver.buildParameters(super.m_parameters, context, objectModel);
1.18 +2 -2
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java
Index: JSCocoon.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- JSCocoon.java 27 Jan 2004 13:27:49 -0000 1.17
+++ JSCocoon.java 27 Jan 2004 13:41:51 -0000 1.18
@@ -263,7 +263,7 @@
try {
// Cannot use environment directly as TreeProcessor uses own
version of redirector
// environment.redirect(false, uri);
- EnvironmentHelper.getRedirector().redirect(false, uri);
+
EnvironmentHelper.getRedirector(this.environment).redirect(false, uri);
} catch (Exception e) {
throw new JavaScriptException(e);
}
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EnvironmentHelper.java 27 Jan 2004 13:27:54 -0000 1.3
+++ EnvironmentHelper.java 27 Jan 2004 13:41:51 -0000 1.4
@@ -482,8 +482,8 @@
/**
* Return the SourceResolver
*/
- public static SourceResolver getSourceResolver() {
- final EnvironmentContext ctx = getCurrentEnvironmentContext();
+ public static SourceResolver getSourceResolver(Environment env) {
+ final EnvironmentContext ctx = getEnvironmentContext(env);
if (ctx != null) {
return (SourceResolver) ctx.getAttribute(SOURCE_RESOLVER_KEY);
}
@@ -493,8 +493,8 @@
/**
* Return the Redirector
*/
- public static Redirector getRedirector() {
- final EnvironmentContext ctx = getCurrentEnvironmentContext();
+ public static Redirector getRedirector(Environment env) {
+ final EnvironmentContext ctx = getEnvironmentContext(env);
if (ctx != null) {
return (Redirector) ctx.getAttribute(REDIRECTOR_KEY);
}
1.18 +2 -2
cocoon-2.2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- AbstractInterpreter.java 27 Jan 2004 13:28:01 -0000 1.17
+++ AbstractInterpreter.java 27 Jan 2004 13:41:57 -0000 1.18
@@ -242,6 +242,6 @@
Map objectModel = environment.getObjectModel();
FlowHelper.setContextObject(objectModel, bizData);
FlowHelper.setWebContinuation(objectModel, continuation);
- EnvironmentHelper.getRedirector().redirect(false, uri);
+ EnvironmentHelper.getRedirector(environment).redirect(false, uri);
}
}
1.20 +3 -3
cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- FOM_Cocoon.java 27 Jan 2004 13:28:06 -0000 1.19
+++ FOM_Cocoon.java 27 Jan 2004 13:42:06 -0000 1.20
@@ -206,11 +206,11 @@
public void jsFunction_redirectTo(String uri) throws Exception {
// Cannot use environment directly as TreeProcessor uses own version
of redirector
// environment.redirect(false, uri);
- EnvironmentHelper.getRedirector().redirect(false, uri);
+ EnvironmentHelper.getRedirector(this.environment).redirect(false,
uri);
}
public void jsFunction_sendStatus(int sc) {
- EnvironmentHelper.getRedirector().sendStatus(sc);
+ EnvironmentHelper.getRedirector(this.environment).sendStatus(sc);
}
/*
