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 57042D7DF for ; Fri, 9 Nov 2012 10:14:52 +0000 (UTC) Received: (qmail 25225 invoked by uid 500); 9 Nov 2012 10:14:52 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 25108 invoked by uid 500); 9 Nov 2012 10:14:50 -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 25086 invoked by uid 99); 9 Nov 2012 10:14:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Nov 2012 10:14:49 +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; Fri, 09 Nov 2012 10:14:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D427E23888CD; Fri, 9 Nov 2012 10:14:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1407408 - /sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java Date: Fri, 09 Nov 2012 10:14:28 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121109101428.D427E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Nov 9 10:14:28 2012 New Revision: 1407408 URL: http://svn.apache.org/viewvc?rev=1407408&view=rev Log: SLING-2530 : Implement CRUD based on resources Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java Modified: sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java?rev=1407408&r1=1407407&r2=1407408&view=diff ============================================================================== --- sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java (original) +++ sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/ResourceResolverImpl.java Fri Nov 9 10:14:28 2012 @@ -1015,6 +1015,11 @@ public class ResourceResolverImpl extend */ public void delete(final Resource resource) throws PersistenceException { + // check if the resource is non existing - throws NPE if resource is null as stated in the API + if ( ResourceUtil.isNonExistingResource(resource) ) { + // nothing to do + return; + } // if resource is null, we get an NPE as stated in the API final String path = resource.getPath(); final ModifyingResourceProvider mrp = this.factory.getRootProviderEntry().getModifyingProvider(this.context,