Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1698ED41C for ; Mon, 3 Dec 2012 13:54:15 +0000 (UTC) Received: (qmail 38452 invoked by uid 500); 3 Dec 2012 13:54:15 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 38357 invoked by uid 500); 3 Dec 2012 13:54:13 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 37741 invoked by uid 99); 3 Dec 2012 13:54:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2012 13:54:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 03 Dec 2012 13:54:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D043023888E4; Mon, 3 Dec 2012 13:53:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1416518 - /sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java Date: Mon, 03 Dec 2012 13:53:50 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121203135350.D043023888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Mon Dec 3 13:53:49 2012 New Revision: 1416518 URL: http://svn.apache.org/viewvc?rev=1416518&view=rev Log: SLING-2688 : Node remove/add events should not be compacted Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java Modified: sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java?rev=1416518&r1=1416517&r2=1416518&view=diff ============================================================================== --- sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java (original) +++ sling/trunk/bundles/jcr/resource/src/main/java/org/apache/sling/jcr/resource/internal/JcrResourceListener.java Mon Dec 3 13:53:49 2012 @@ -194,12 +194,7 @@ public class JcrResourceListener impleme this.updateChangedEvent(changedEvents, nodePath, event, propName); } else if ( event.getType() == Event.NODE_ADDED ) { - // check if this is a remove/add operation - if ( removedEvents.remove(eventPath) != null ) { - this.updateChangedEvent(changedEvents, eventPath, event, null); - } else { - addedEvents.put(eventPath, event); - } + addedEvents.put(eventPath, event); } else if ( event.getType() == Event.NODE_REMOVED) { // remove is the strongest operation, therefore remove all removed @@ -215,7 +210,7 @@ public class JcrResourceListener impleme for (final Entry e : removedEvents.entrySet()) { // Launch an OSGi event sendOsgiEvent(e.getKey(), e.getValue(), SlingConstants.TOPIC_RESOURCE_REMOVED, - changedEvents.remove(e.getKey())); + null); } for (final Entry e : addedEvents.entrySet()) { @@ -406,11 +401,6 @@ public class JcrResourceListener impleme path); sendEvent = false; } - } else { - // check if the resource is still available - if so the node was not visible! - if ( resource != null ) { - sendEvent = false; - } } if ( sendEvent ) {