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 2012/04/24 14:27:50 UTC
svn commit: r1329671 - in /ant/ivy/core/branches/2.3.x: ./ CHANGES.txt
src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
Author: hibou
Date: Tue Apr 24 12:27:50 2012
New Revision: 1329671
URL: http://svn.apache.org/viewvc?rev=1329671&view=rev
Log:
merge r 1329663:
IVY-1343: fix for a NullPointerExeption in AbstractOSGiResolver (thanks to Thomas Kurpick)
Added:
ant/ivy/core/branches/2.3.x/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
- copied unchanged from r1329663, ant/ivy/core/trunk/test/java/org/apache/ivy/osgi/updatesite/UpdateSiteAndIbiblioResolverTest.java
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/CHANGES.txt
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1329663
Modified: ant/ivy/core/branches/2.3.x/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/CHANGES.txt?rev=1329671&r1=1329670&r2=1329671&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.3.x/CHANGES.txt Tue Apr 24 12:27:50 2012
@@ -67,6 +67,7 @@ for detailed view of each issue, please
Stepan Koltsov
Heschi Kreinick
Sebastian Krueger
+ Thomas Kurpick
Tat Leung
Costin Leau
Antoine Levy-Lambert
@@ -122,6 +123,10 @@ for detailed view of each issue, please
Sven Zethelius
Aleksey Zhukov
+ 2.3.x
+=====================================
+- FIX: NullPointerExeption in AbstractOSGiResolver (IVY-1343) (thanks to Thomas Kurpick)
+
2.3.0-rc1
=====================================
- DOCUMENTATION: Bad example in Project dependencies Tutorial (IVY-1263)
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java?rev=1329671&r1=1329670&r2=1329671&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java Tue Apr 24 12:27:50 2012
@@ -294,6 +294,10 @@ public abstract class AbstractOSGiResolv
public ResolvedResource findArtifactRef(Artifact artifact, Date date) {
URL url = artifact.getUrl();
+ if (url == null) {
+ // not an artifact resolved by this resolver
+ return null;
+ }
Message.verbose("\tusing url for " + artifact + ": " + url);
logArtifactAttempt(artifact, url.toExternalForm());
Resource resource = new URLResource(url);