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 2010/12/20 11:57:46 UTC
svn commit: r1051063 -
/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java
Author: hibou
Date: Mon Dec 20 10:57:46 2010
New Revision: 1051063
URL: http://svn.apache.org/viewvc?rev=1051063&view=rev
Log:
handle url which are absolute
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java
Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java?rev=1051063&r1=1051062&r2=1051063&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/repo/RelativeURLRepository.java Mon Dec 20 10:57:46 2010
@@ -18,6 +18,8 @@
package org.apache.ivy.osgi.repo;
import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
@@ -46,7 +48,14 @@ public class RelativeURLRepository exten
source = encode(source);
Resource res = (Resource) resourcesCache.get(source);
if (res == null) {
- if (baseUrl == null) {
+ URI uri;
+ try {
+ uri = new URI(source);
+ } catch (URISyntaxException e) {
+ // very wierd URL, let's assume it is absolute
+ uri = null;
+ }
+ if (uri == null || uri.isAbsolute()) {
res = new URLResource(new URL(source));
} else {
res = new URLResource(new URL(baseUrl + source));