incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r1213753 - /sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Date Tue, 13 Dec 2011 15:56:53 GMT
Author: cziegeler
Date: Tue Dec 13 15:56:53 2011
New Revision: 1213753

URL: http://svn.apache.org/viewvc?rev=1213753&view=rev
Log:
Ignore paths from other resource providers.

Modified:
    sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java

Modified: sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
URL: http://svn.apache.org/viewvc/sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java?rev=1213753&r1=1213752&r2=1213753&view=diff
==============================================================================
--- sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
(original)
+++ sling/trunk/installer/providers/jcr/src/main/java/org/apache/sling/installer/provider/jcr/impl/JcrInstaller.java
Tue Dec 13 15:56:53 2011
@@ -631,11 +631,11 @@ public class JcrInstaller implements Eve
 
             final String path;
             boolean resourceIsMoved = true;
-            if ( url != null && url.startsWith(URL_SCHEME + ':')) {
+            if ( url != null ) {
                 // update
                 final int pos = url.indexOf(':');
                 final String oldPath = url.substring(pos + 1);
-                final String nodePath = getPathWithHighestPrio(oldPath);
+                final String nodePath = getPathWithHighestPrio(url.startsWith(URL_SCHEME
+ ':') ? oldPath : this.newConfigPath + id + ".config");
                 // ensure extension 'config'
                 if ( !nodePath.endsWith(".config") ) {
                     if ( session.itemExists(nodePath) ) {



Mime
View raw message