Author: lgawron Date: Wed Dec 1 04:06:32 2004 New Revision: 109331 URL: http://svn.apache.org/viewcvs?view=rev&rev=109331 Log: fix: (patch - bugzilla entry 32465) warn about use of continuation in wrong sitemap. Thanks to Johan Stuyts <johan(at)hippo.nl>.
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java?view=diff&rev=109331&p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java&r1=109330&p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java&r2=109331 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/ContinuationsManagerImpl.java Wed Dec 1 04:06:32 2004 @@ -167,8 +167,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/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java?view=diff&rev=109331&p1=cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java&r1=109330&p2=cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java&r2=109331 ============================================================================== --- cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java (original) +++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/WebContinuation.java Wed Dec 1 04:06:32 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. *
