From effe71fb908e7bb7c1339f4090f0bf06b3e05095 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Fri, 14 Aug 2009 03:41:32 +0000 Subject: [PATCH] JETTY-1079 git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@721 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../org/eclipse/jetty/util/resource/ResourceCollection.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 3c686cb8a9a..d327914c1a8 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -2,6 +2,7 @@ jetty-7.0.0.RC4-SNAPSHOT + 286185 Implement ability for JSON implementation to automatically register convertors + Added discoverable start options + 286535 ContentExchange status code + + JETTY-1079 jetty-7.0.0.RC3 7 August 2009 + 277403 remove system properties diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java index 27d9bdb27c6..b1ea66cc8f5 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java @@ -445,7 +445,7 @@ public class ResourceCollection extends Resource public String toString() { if(_resources==null) - throw new IllegalStateException("*resources* not set."); + return ""; StringBuilder buffer = new StringBuilder(); for(Resource r : _resources)