Return-Path: Delivered-To: apmail-incubator-sling-commits-archive@locus.apache.org Received: (qmail 92402 invoked from network); 14 Sep 2007 06:44:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Sep 2007 06:44:46 -0000 Received: (qmail 1178 invoked by uid 500); 14 Sep 2007 06:44:39 -0000 Delivered-To: apmail-incubator-sling-commits-archive@incubator.apache.org Received: (qmail 1167 invoked by uid 500); 14 Sep 2007 06:44:39 -0000 Mailing-List: contact sling-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: sling-dev@incubator.apache.org Delivered-To: mailing list sling-commits@incubator.apache.org Received: (qmail 1158 invoked by uid 99); 14 Sep 2007 06:44:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Sep 2007 23:44:39 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2007 06:46:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2B19E1A9832; Thu, 13 Sep 2007 23:44:23 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r575559 - /incubator/sling/trunk/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Date: Fri, 14 Sep 2007 06:44:22 -0000 To: sling-commits@incubator.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070914064423.2B19E1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Thu Sep 13 23:44:13 2007 New Revision: 575559 URL: http://svn.apache.org/viewvc?rev=575559&view=rev Log: Keep lock token in global session until it is released by another session. Modified: incubator/sling/trunk/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Modified: incubator/sling/trunk/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java URL: http://svn.apache.org/viewvc/incubator/sling/trunk/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java?rev=575559&r1=575558&r2=575559&view=diff ============================================================================== --- incubator/sling/trunk/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java (original) +++ incubator/sling/trunk/event/src/main/java/org/apache/sling/event/impl/JobEventHandler.java Thu Sep 13 23:44:13 2007 @@ -193,9 +193,7 @@ eventNode.refresh(true); if ( eventNode.getProperty(EventHelper.NODE_PROPERTY_ACTIVE).getBoolean() ) { unlock = false; - final String lockToken = lock.getLockToken(); - this.processJob(info.event, eventNode, lockToken); - this.session.removeLockToken(lockToken); + this.processJob(info.event, eventNode, lock.getLockToken()); } else { eventNode.unlock(); } @@ -570,7 +568,8 @@ Session s = null; try { s = this.createSession(); - // add lock token to current session + // remove lock token from shared session and add it to current session + this.session.removeLockToken(lockToken); s.addLockToken(lockToken); final Node eventNode = (Node) s.getItem(eventNodePath); try {