Author: lgawron Date: Wed Dec 1 04:01:14 2004 New Revision: 109330 URL: http://svn.apache.org/viewcvs?view=rev&rev=109330 Log: fix: (patch) warn about use of continuation in wrong sitemap. Thanks to Johan Stuyts <johan(at)hippo.nl>.
whitespace tweaks Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java 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_WebContinuation.java Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java?view=diff&rev=109330&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java&r1=109329&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java&r2=109330 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/ApplesProcessor.java Wed Dec 1 04:01:14 2004 @@ -125,7 +125,7 @@ DefaultAppleResponse res = new DefaultAppleResponse(cocoonResponse); try { - app.process(req, res); + app.process(req, res); } finally { if (wk == null) { // dispose stateless apple immediatelly Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diff&rev=109330&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java&r1=109329&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java&r2=109330 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Wed Dec 1 04:01:14 2004 @@ -200,8 +200,16 @@ // REVISIT: Is the following check needed to avoid threading issues: // return wk only if !(wk.hasExpired) ? WebContinuation kont = (WebContinuation) idToWebCont.get(id); - if ( kont != null ) - return (kont.interpreterMatches(interpreterId)) ? kont : null; + if ( kont != null ) { + boolean interpreterMatches = kont.interpreterMatches(interpreterId); + if (!interpreterMatches && getLogger().isWarnEnabled()) { + getLogger().warn("WK: Continuation (" + kont.getId() + + ") lookup for wrong interpreter. Bound to: " + + kont.getInterpreterId() + ", looked up for: " + + interpreterId); + } + return interpreterMatches ? kont : null; + } return null; } Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java?view=diff&rev=109330&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java&r1=109329&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java&r2=109330 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/WebContinuation.java Wed Dec 1 04:01:14 2004 @@ -198,6 +198,16 @@ } /** + * Returns the string identifier of the interpreter to which + * this <code>WebContinuation</code> is bound. + * + * @return a <code>String</code> value + */ + public String getInterpreterId() { + return interpreterId; + } + + /** * Returns the last time this * <code>WebContinuation</code> was accessed. * Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java?view=diff&rev=109330&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java&r1=109329&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java&r2=109330 ============================================================================== --- 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 Wed Dec 1 04:01:14 2004 @@ -1279,7 +1279,6 @@ public InputStream getResourceAsStream(String path) { return context.getResourceAsStream(path); } - } public static class FOM_Log extends ScriptableObject { Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java?view=diff&rev=109330&p1=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java&r1=109329&p2=cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java&r2=109330 ============================================================================== --- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java (original) +++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_WebContinuation.java Wed Dec 1 04:01:14 2004 @@ -227,7 +227,7 @@ } /** - * Return text representation of the WebContinuation. + * Return text representation of the WebContinuation. */ public String toString() { return "WC" + wk.getId();
