incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmesc...@apache.org
Subject svn commit: r834077 - /sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
Date Mon, 09 Nov 2009 14:25:58 GMT
Author: fmeschbe
Date: Mon Nov  9 14:25:52 2009
New Revision: 834077

URL: http://svn.apache.org/viewvc?rev=834077&view=rev
Log:
SLING-1162 Apply patch to force SNAPSHOT installation provided by Justin Edelson (Thanks)

Modified:
    sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java

Modified: sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java?rev=834077&r1=834076&r2=834077&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
(original)
+++ sling/trunk/launchpad/base/src/main/java/org/apache/sling/launchpad/base/impl/BootstrapInstaller.java
Mon Nov  9 14:25:52 2009
@@ -607,6 +607,15 @@
             Constants.BUNDLE_VERSION);
         Version installedVersion = Version.parseVersion(installedVersionProp);
 
+        // if the new version and the current version are the same, reinstall if
+        // the version is a snapshot
+        if (newVersion.equals(installedVersion)
+            && installedVersionProp.endsWith("SNAPSHOT")) {
+            logger.log(Logger.LOG_INFO, "Forcing upgrade of SNAPSHOT bundle: "
+                + installedBundle.getSymbolicName());
+            return false;
+        }
+
         return newVersion.compareTo(installedVersion) <= 0;
     }
 



Mime
View raw message