sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r1607658 - /sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Date Thu, 03 Jul 2014 14:22:17 GMT
Author: bdelacretaz
Date: Thu Jul  3 14:22:16 2014
New Revision: 1607658

URL: http://svn.apache.org/r1607658
Log:
SLING-3648 - make sure content is installed if a bundle is updated while this module is inactive

Modified:
    sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java

Modified: sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java?rev=1607658&r1=1607657&r2=1607658&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
(original)
+++ sling/trunk/bundles/jcr/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Thu Jul  3 14:22:16 2014
@@ -146,7 +146,7 @@ public class Loader extends BaseImportLo
                 if (!isUpdate && !isBundleUpdated && contentAlreadyLoaded)
{
                     log.info("Content of bundle already loaded {}.", bundle.getSymbolicName());
                 } else {
-                    createdNodes = installContent(metadataSession, bundle, pathIter, contentAlreadyLoaded);
+                    createdNodes = installContent(metadataSession, bundle, pathIter, contentAlreadyLoaded
&& !isBundleUpdated);
                     if (isRetry) {
                         // log success of retry
                         log.info("Retrying to load initial content for bundle {} succeeded.",
bundle.getSymbolicName());



Mime
View raw message