Author: cziegeler
Date: Tue Apr 30 07:34:07 2013
New Revision: 1477492
URL: http://svn.apache.org/r1477492
Log:
SLING-2844 : ResourceUtil.isA() and findResourceSuperType() should check for
null resource
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
Modified:
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java?rev=1477492&r1=1477491&r2=1477492&view=diff
==============================================================================
---
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
(original)
+++
sling/trunk/bundles/api/src/main/java/org/apache/sling/api/resource/ResourceUtil.java
Tue Apr 30 07:34:07 2013
@@ -438,6 +438,9 @@ public class ResourceUtil {
*/
@Deprecated
public static String findResourceSuperType(final Resource resource) {
+ if ( resource == null ) {
+ return null;
+ }
return resource.getResourceResolver().getParentResourceType(resource);
}
@@ -457,6 +460,9 @@ public class ResourceUtil {
*/
@Deprecated
public static boolean isA(final Resource resource, final String
resourceType) {
+ if ( resource == null ) {
+ return false;
+ }
return resource.getResourceResolver().isResourceType(resource,
resourceType);
}