svn commit: r1700426 - /sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java

[asanso]

Author: asanso
Date: Tue Sep  1 09:02:53 2015
New Revision: 1700426

URL: http://svn.apache.org/r1700426
Log:
SLING-4982 - NPE in ContentDispositionFilter

Modified:
    
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java

Modified: 
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java?rev=1700426&r1=1700425&r2=1700426&view=diff
==============================================================================
--- 
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
 (original)
+++ 
sling/trunk/contrib/extensions/security/src/main/java/org/apache/sling/security/impl/ContentDispositionFilter.java
 Tue Sep  1 09:02:53 2015
@@ -283,19 +283,23 @@ public class ContentDispositionFilter im
         
         private boolean isJcrData(Resource resource){
             boolean jcrData = false;
-            if (resource!= null) {
-                ValueMap props = resource.adaptTo(ValueMap.class);
-                if (props != null && props.containsKey(PROP_JCR_DATA) ) {
-                    jcrData = true;
-                } else {
-                    Resource jcrContent = resource.getChild(JCR_CONTENT_LEAF);
-                    if (jcrContent!= null) {
-                        props = jcrContent.adaptTo(ValueMap.class);
-                        if (props != null && props.containsKey(PROP_JCR_DATA) 
) {
-                            jcrData = true;
+            try {
+                if (resource!= null) {
+                    ValueMap props = resource.adaptTo(ValueMap.class);
+                    if (props != null && props.containsKey(PROP_JCR_DATA) ) {
+                        jcrData = true;
+                    } else {
+                        Resource jcrContent = 
resource.getChild(JCR_CONTENT_LEAF);
+                        if (jcrContent!= null) {
+                            props = jcrContent.adaptTo(ValueMap.class);
+                            if (props != null && 
props.containsKey(PROP_JCR_DATA) ) {
+                                jcrData = true;
+                            }
                         }
-                    }
-                }     
+                    }     
+                }
+            } catch (Exception e) {
+                logger.error("Exception in isJcrData", e);
             }
             return jcrData;
         }