Author: julien_viet Date: 2011-01-14 18:34:05 -0500 (Fri, 14 Jan 2011) New Revision: 5752 Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletContextImpl.java Log: GTNPC-51 : PortletContext getResourcePaths(String s) should return null when an empty set is returned by the servlet container Modified: components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletContextImpl.java =================================================================== --- components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletContextImpl.java 2011-01-14 23:24:04 UTC (rev 5751) +++ components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/PortletContextImpl.java 2011-01-14 23:34:05 UTC (rev 5752) @@ -125,7 +125,9 @@ public Set<String> getResourcePaths(String s) { - return (Set<String>)servletContext.getResourcePaths(s); + Set<String> paths = (Set<String>)servletContext.getResourcePaths(s); + // Some container (jetty) may return an empty set instead of null + return (paths == null || paths.isEmpty()) ? null : paths; } public URL getResource(String s) throws MalformedURLException