You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/09/02 15:09:57 UTC
svn commit: rev 37374 - cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom
Author: vgritsenko
Date: Thu Sep 2 06:09:56 2004
New Revision: 37374
Modified:
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Log:
minor tweaks
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java Thu Sep 2 06:09:56 2004
@@ -273,12 +273,13 @@
public void jsFunction_processPipelineTo(String uri,
Object map,
Object outputStream)
- throws Exception {
- if (!(unwrap(outputStream) instanceof OutputStream)) {
- throw new JavaScriptException("expected a java.io.OutputStream instead of " + outputStream);
+ throws Exception {
+ Object out = unwrap(outputStream);
+ if (!(out instanceof OutputStream)) {
+ throw new JavaScriptException("expected a java.io.OutputStream instead of " + out);
}
getInterpreter().process(getParentScope(), this, uri, map,
- (OutputStream)unwrap(outputStream));
+ (OutputStream)out);
}
public void jsFunction_redirectTo(String uri, boolean isGlobal) throws Exception {
Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Thu Sep 2 06:09:56 2004
@@ -823,7 +823,8 @@
public void forwardTo(Scriptable scope, FOM_Cocoon cocoon, String uri,
Object bizData, FOM_WebContinuation fom_wk,
- Redirector redirector) throws Exception {
+ Redirector redirector)
+ throws Exception {
setupView(scope, cocoon, fom_wk);
super.forwardTo(uri, bizData,
fom_wk == null ? null : fom_wk.getWebContinuation(),
@@ -832,7 +833,8 @@
// package access as this is called by FOM_Cocoon
void process(Scriptable scope, FOM_Cocoon cocoon, String uri,
- Object bizData, OutputStream out) throws Exception {
+ Object bizData, OutputStream out)
+ throws Exception {
setupView(scope, cocoon, null);
super.process(uri, bizData, out);
}