You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/01/29 13:34:44 UTC
svn commit: r1655625 -
/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
Author: stefanegli
Date: Thu Jan 29 12:34:43 2015
New Revision: 1655625
URL: http://svn.apache.org/r1655625
Log:
SLING-4366 : avoid a NPE happening when log level is set to DEBUG
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
Modified: sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java?rev=1655625&r1=1655624&r2=1655625&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/main/java/org/apache/sling/discovery/impl/common/View.java Thu Jan 29 12:34:43 2015
@@ -85,6 +85,12 @@ public class View {
*/
public String getViewId() {
final ValueMap props = getResource().adaptTo(ValueMap.class);
+ if (props==null) {
+ // avoid a NPE below
+ logger.warn("getViewId: could not get properties of "+getResource().getPath()+
+ ", using resource name instead: "+getResource().getName());
+ return getResource().getName();
+ }
final String clusterId = props.get(VIEW_PROPERTY_CLUSTER_ID, String.class);
if (clusterId != null && clusterId.length() > 0) {
return clusterId;