sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1631000 - /sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Date Fri, 10 Oct 2014 22:17:43 GMT
Author: rombert
Date: Fri Oct 10 22:17:42 2014
New Revision: 1631000

URL: http://svn.apache.org/r1631000
Log:
SLING-4020 - Importing content from the repository triggers publish
operations

Only attempt to create the resource's parents if the resource will be
published.

Modified:
    sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java

Modified: sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java?rev=1631000&r1=1630999&r2=1631000&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
(original)
+++ sling/trunk/tooling/ide/eclipse-core/src/org/apache/sling/ide/eclipse/core/internal/SlingLaunchpadBehaviour.java
Fri Oct 10 22:17:42 2014
@@ -416,13 +416,14 @@ public class SlingLaunchpadBehaviour ext
                         case IModuleResourceDelta.ADDED:
                         case IModuleResourceDelta.CHANGED:
                         case IModuleResourceDelta.NO_CHANGE: // TODO is this needed?
-                            ensureParentIsPublished(resourceDelta.getModuleResource(), repository,
allResources,
-                                    handledPaths);
                             Command<?> command = addFileCommand(repository, resourceDelta.getModuleResource());
-                            execute(command);
+
                             if (command != null) {
+                                ensureParentIsPublished(resourceDelta.getModuleResource(),
repository, allResources,
+                                        handledPaths);
                                 addedOrUpdatedResources.add(resourceDelta.getModuleResource());
                             }
+                            execute(command);
                             break;
                         case IModuleResourceDelta.REMOVED:
                             execute(removeFileCommand(repository, resourceDelta.getModuleResource()));



Mime
View raw message