| commit | 57c0b5d59c1bdc88a1338076a80d4488c627f20a | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Fri Oct 24 20:37:21 2008 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Fri Oct 24 20:37:21 2008 +0000 |
| tree | 6123267dd0f21c726d8431568539577680845ec0 | |
| parent | 15751354657742dbf45195bc551c572d13aecebe [diff] |
Fixed potential NPE when comparing resources. (FELIX-789) git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@707743 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java index 683a4d5..40bd499 100644 --- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java +++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java
@@ -30,6 +30,14 @@ Resource r2 = (Resource) o2; String name1 = (String) r1.getPresentationName(); String name2 = (String) r2.getPresentationName(); + if (name1 == null) + { + return -1; + } + else if (name2 == null) + { + return 1; + } return name1.compareToIgnoreCase(name2); } } \ No newline at end of file