Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 73117 invoked from network); 29 Oct 2003 12:01:05 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 29 Oct 2003 12:01:05 -0000 Received: (qmail 13012 invoked by uid 500); 29 Oct 2003 12:01:03 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 12943 invoked by uid 500); 29 Oct 2003 12:01:03 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 12932 invoked by uid 500); 29 Oct 2003 12:01:02 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 12929 invoked from network); 29 Oct 2003 12:01:02 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 29 Oct 2003 12:01:02 -0000 Received: (qmail 73070 invoked by uid 1707); 29 Oct 2003 12:01:03 -0000 Date: 29 Oct 2003 12:01:03 -0000 Message-ID: <20031029120103.73068.qmail@minotaur.apache.org> From: ugo@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom FOM_Cocoon.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N ugo 2003/10/29 04:01:03 Modified: src/java/org/apache/cocoon/components/flow/javascript/fom FOM_Cocoon.java Log: Added a couple of null checks to FOM_Cocoon as a workaround in case an instance of FOM_Cocoon is invalidated twice. Revision Changes Path 1.15 +11 -3 cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java Index: FOM_Cocoon.java =================================================================== RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- FOM_Cocoon.java 28 Oct 2003 17:21:14 -0000 1.14 +++ FOM_Cocoon.java 29 Oct 2003 12:01:02 -0000 1.15 @@ -134,7 +134,14 @@ void invalidate() { // Clear the scope attribute - this.getRequest().removeAttribute(FOM_JavaScriptFlowHelper.FOM_SCOPE); + Request request = this.getRequest(); + if (request != null) { + request.removeAttribute(FOM_JavaScriptFlowHelper.FOM_SCOPE); + } + else { + // Cannot use logger here, as it might already be null + System.err.println("Request is null. Might be trying to invalidate an already invalidated FOM_Cocoon instance."); + } // Cleanup everything this.request = null; @@ -882,7 +889,8 @@ * @return The request */ public Request getRequest() { - return jsGet_request().request; + FOM_Request fom_request = jsGet_request(); + return fom_request != null ? fom_request.request : null; } /**