You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2013/12/29 18:05:51 UTC
svn commit: r1554047 - in /ant/ivy/core/trunk: CHANGES.txt
src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
Author: hibou
Date: Sun Dec 29 17:05:51 2013
New Revision: 1554047
URL: http://svn.apache.org/r1554047
Log:
fix a NPE when loading a composite P2 repository with no children
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1554047&r1=1554046&r2=1554047&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sun Dec 29 17:05:51 2013
@@ -170,6 +170,7 @@ for detailed view of each issue, please
- FIX: When inheriting a module descriptor, also merge the exclude rules
- FIX: Correct application of mediators (ie. override) during conflict resolution (IVY-1455)
- FIX: Fix revision number mapping across namespaces (IVY-1423)
+- FIX: fix a NPE when loading a composite P2 repository with no children
2.3.0
=====================================
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java?rev=1554047&r1=1554046&r2=1554047&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/p2/P2CompositeParser.java Sun Dec 29 17:05:51 2013
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -60,7 +61,7 @@ public class P2CompositeParser implement
//
// private static final String VERSION = "version";
- List<String> childLocations;
+ List<String> childLocations = Collections.emptyList();
public RepositoryHandler() {
super(REPOSITORY);