From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 12 Oct 2010 04:56:52 +0000 (+0000)
Subject: Gracefully handle empty resource sets
X-Git-Tag: argeo-slc-2.1.7~1136
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=inline;h=ee339f6b1ea1ea826e9842e4caac1be30e15b1ed;p=gpl%2Fargeo-slc.git

Gracefully handle empty resource sets

git-svn-id: https://svn.argeo.org/slc/trunk@3838 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java
index 192775717..65e5fa1d0 100644
--- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java
+++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/deploy/DefaultResourceSet.java
@@ -54,9 +54,11 @@ public class DefaultResourceSet implements ResourceLoaderAware,
 	/** List the resources, identified by their relative path. */
 	public Map<String, Resource> listResources() {
 		try {
+			Map<String, Resource> res = new TreeMap<String, Resource>();
+			if (base == null)
+				return res;
 			String baseResUrl = getResourceLoaderToUse().getResource(base)
 					.getURL().toString();
-			Map<String, Resource> res = new TreeMap<String, Resource>();
 			for (String includePattern : includes)
 				processInclude(res, includePattern, baseResUrl);
 			return res;