Author: cziegeler
Date: Tue Oct 11 16:28:04 2016
New Revision: 1764289
URL: http://svn.apache.org/viewvc?rev=1764289&view=rev
Log:
SLING-6131 : MapEntries: Invalid logic around added/changed/removed property
names
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Modified:
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java?rev=1764289&r1=1764288&r2=1764289&view=diff
==============================================================================
---
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
(original)
+++
sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Tue Oct 11 16:28:04 2016
@@ -591,7 +591,7 @@ public class MapEntries implements Resou
return false;
}
- private void doRemoveAlias(String path, boolean nodeDeletion) {
+ private boolean doRemoveAlias(String path, boolean nodeDeletion) {
String resourceName = null;
if (nodeDeletion) {
if (!"/".equals(path)){
@@ -626,6 +626,7 @@ public class MapEntries implements Resou
if (aliasMapEntry != null && aliasMapEntry.isEmpty()) {
this.aliasMap.remove(path);
}
+ return aliasMap != null;
}
public boolean isOptimizeAliasResolutionEnabled() {
@@ -818,6 +819,7 @@ public class MapEntries implements Resou
this.resolver.refresh();
}
boolean changed = doUpdateVanity(path);
+ changed |= doRemoveAlias(path, false);
changed |= doUpdateAlias(path, false);
if ( changed ) {
