Author: sseifert
Date: Thu Dec 8 17:36:15 2016
New Revision: 1773273
URL: http://svn.apache.org/viewvc?rev=1773273&view=rev
Log:
SLING-6367 fix potential NPE when resource collection does not exist, add more
ignored property names
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilter.java
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java?rev=1773273&r1=1773272&r2=1773273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/ConfigurationCollectionDataImpl.java
Thu Dec 8 17:36:15 2016
@@ -59,8 +59,11 @@ final class ConfigurationCollectionDataI
@Override
public Map<String, Object> getProperties() {
if (filteredPropertiesCache == null) {
- filteredPropertiesCache = new HashMap<>(properties);
- PropertiesFilter.removeIgnoredProperties(filteredPropertiesCache);
+ filteredPropertiesCache = new HashMap<>();
+ if (properties != null) {
+ filteredPropertiesCache.putAll(properties);
+
PropertiesFilter.removeIgnoredProperties(filteredPropertiesCache);
+ }
}
return filteredPropertiesCache;
}
Modified:
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilter.java
URL:
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilter.java?rev=1773273&r1=1773272&r2=1773273&view=diff
==============================================================================
---
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilter.java
(original)
+++
sling/trunk/contrib/extensions/contextaware-config/impl/src/main/java/org/apache/sling/caconfig/management/impl/PropertiesFilter.java
Thu Dec 8 17:36:15 2016
@@ -29,7 +29,9 @@ import java.util.Set;
final class PropertiesFilter {
private static final Set<String> PROPERTIES_TO_IGNORE = new
HashSet<>(Arrays.asList(
- "jcr:primaryType"));
+ "jcr:primaryType",
+ "jcr:created",
+ "jcr:createdBy"));
private PropertiesFilter() {
// static methods only
