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 C06D0901D for ; Fri, 10 Feb 2012 12:29:39 +0000 (UTC) Received: (qmail 48932 invoked by uid 500); 10 Feb 2012 12:29:39 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 48865 invoked by uid 500); 10 Feb 2012 12:29:38 -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 48858 invoked by uid 99); 10 Feb 2012 12:29:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 10 Feb 2012 12:29:38 +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, 10 Feb 2012 12:29:35 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9B04B23889B3; Fri, 10 Feb 2012 12:29:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1242752 - in /sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl: OsgiInstallerImpl.java tasks/BundleUpdateTask.java Date: Fri, 10 Feb 2012 12:29:14 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120210122914.9B04B23889B3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Fri Feb 10 12:29:14 2012 New Revision: 1242752 URL: http://svn.apache.org/viewvc?rev=1242752&view=rev Log: SLING-2417 : Start level should be changed for upgrades Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java?rev=1242752&r1=1242751&r2=1242752&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/OsgiInstallerImpl.java Fri Feb 10 12:29:14 2012 @@ -227,6 +227,7 @@ public class OsgiInstallerImpl * Wake up the run cycle. */ private void wakeUp() { + this.listener.start(); synchronized (this.resourcesLock) { this.resourcesLock.notify(); } @@ -310,9 +311,7 @@ public class OsgiInstallerImpl public void updateResources(final String scheme, final InstallableResource[] resources, final String[] ids) { - synchronized ( this.resourcesLock ) { - this.listener.start(); - } + this.listener.start(); try { final List updatedResources = this.createResources(scheme, resources); @@ -363,9 +362,7 @@ public class OsgiInstallerImpl * @see org.apache.sling.installer.api.OsgiInstaller#registerResources(java.lang.String, org.apache.sling.installer.api.InstallableResource[]) */ public void registerResources(final String scheme, final InstallableResource[] resources) { - synchronized ( this.resourcesLock ) { - this.listener.start(); - } + this.listener.start(); try { List registeredResources = this.createResources(scheme, resources); if ( registeredResources == null ) { @@ -723,6 +720,7 @@ public class OsgiInstallerImpl * @see org.apache.sling.installer.api.tasks.RetryHandler#scheduleRetry() */ public void scheduleRetry() { + this.listener.start(); synchronized ( this.resourcesLock ) { this.retryDuringTaskExecution = true; } Modified: sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java URL: http://svn.apache.org/viewvc/sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java?rev=1242752&r1=1242751&r2=1242752&view=diff ============================================================================== --- sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java (original) +++ sling/trunk/installer/core/src/main/java/org/apache/sling/installer/core/impl/tasks/BundleUpdateTask.java Fri Feb 10 12:29:14 2012 @@ -90,6 +90,15 @@ public class BundleUpdateTask extends Ab b.stop(); } + // start level handling + final StartLevel startLevelService = this.getStartLevel(); + if ( startLevelService != null ) { + final int newStartLevel = this.getBundleStartLevel(); + final int oldStartLevel = startLevelService.getBundleStartLevel(b); + if ( newStartLevel != oldStartLevel && newStartLevel != 0 ) { + startLevelService.setBundleStartLevel(b, newStartLevel); + } + } b.update(getResource().getInputStream()); ctx.log("Updated bundle {} from resource {}", b, getResource());