You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2012/08/29 03:48:06 UTC
svn commit: r1378423 -
/sling/trunk/bundles/resourceresolver/src/main/java/org/apache/sling/resourceresolver/impl/mapping/MapEntries.java
Author: justin
Date: Wed Aug 29 01:48:05 2012
New Revision: 1378423
URL: http://svn.apache.org/viewvc?rev=1378423&view=rev
Log:
handling duplicate alias case
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=1378423&r1=1378422&r2=1378423&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 Wed Aug 29 01:48:05 2012
@@ -500,7 +500,16 @@ public class MapEntries implements Event
map.put(parentPath, parentMap);
}
for (final String alias : props.get(ResourceResolverImpl.PROP_ALIAS, String[].class)) {
- parentMap.put(alias, resourceName);
+ if (parentMap.containsKey(alias)) {
+ log.warn("Encountered duplicate alias {} under parent path {}. Refusing to replace current target {} with {}.", new Object[] {
+ alias,
+ parentPath,
+ parentMap.get(alias),
+ resourceName
+ });
+ } else {
+ parentMap.put(alias, resourceName);
+ }
}
}