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 95C1A936E for ; Fri, 30 Dec 2011 15:14:05 +0000 (UTC) Received: (qmail 10363 invoked by uid 500); 30 Dec 2011 15:14:05 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 10287 invoked by uid 500); 30 Dec 2011 15:14:04 -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 10280 invoked by uid 99); 30 Dec 2011 15:14:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Dec 2011 15:14:04 +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, 30 Dec 2011 15:14:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7AD792388980; Fri, 30 Dec 2011 15:13:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1225840 - /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java Date: Fri, 30 Dec 2011 15:13:40 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111230151340.7AD792388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Dec 30 15:13:40 2011 New Revision: 1225840 URL: http://svn.apache.org/viewvc?rev=1225840&view=rev Log: SLING-2346 : Config digest needs to be recalculated for older resources Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java?rev=1225840&r1=1225839&r2=1225840&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/RegisteredResourceImpl.java Fri Dec 30 15:13:40 2011 @@ -140,6 +140,12 @@ public class RegisteredResourceImpl } if ( version > 2 ) { this.dataUri = (String)in.readObject(); + } else if ( InstallableResource.TYPE_CONFIG.equals(this.resourceType) && this.dictionary != null ) { + // update digest calculated by older versions + final String updatedDigest = FileDataStore.computeDigest(this.dictionary); + if ( !updatedDigest.equals(this.digest) ) { + this.digest = updatedDigest; + } } }