| commit | a56feac7b76f2695322e80e998169c0d2e3fc454 | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@apache.org> | Sat Aug 02 16:39:59 2008 +0000 |
| committer | Stuart McCulloch <mcculls@apache.org> | Sat Aug 02 16:39:59 2008 +0000 |
| tree | b5974644f5c4928be7269179c8691c1c3bc614a9 | |
| parent | 6381441d2be2d0e0243d8bce3e8022cc179d1d7e [diff] |
FELIX-553: handle opaque URIs git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@682008 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java index 27bb5b7..c26d826 100644 --- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java +++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
@@ -179,7 +179,8 @@ } URI tempURI = ObrUtils.findRepositoryXml( "", remoteOBR ); - String repositoryName = new File( tempURI.getPath() ).getName(); + String repositoryPath = tempURI.isOpaque() ? tempURI.getSchemeSpecificPart() : tempURI.getPath(); + String repositoryName = new File( repositoryPath ).getName(); Log log = getLog(); ObrUpdate update;
diff --git a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java index 8af1114..88816d8 100644 --- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java +++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
@@ -146,7 +146,8 @@ } URI tempURI = ObrUtils.findRepositoryXml( "", remoteOBR ); - String repositoryName = new File( tempURI.getPath() ).getName(); + String repositoryPath = tempURI.isOpaque() ? tempURI.getSchemeSpecificPart() : tempURI.getPath(); + String repositoryName = new File( repositoryPath ).getName(); Log log = getLog(); ObrUpdate update;