| commit | 435f3907cf86984dab8969c717bf309e3a364c22 | [log] [tgz] |
|---|---|---|
| author | Stuart McCulloch <mcculls@apache.org> | Sat Aug 02 16:50:31 2008 +0000 |
| committer | Stuart McCulloch <mcculls@apache.org> | Sat Aug 02 16:50:31 2008 +0000 |
| tree | ea91cd0f4c0c0272028d70967d12de422e7abbb7 | |
| parent | a56feac7b76f2695322e80e998169c0d2e3fc454 [diff] |
FELIX-553: actually safer to always use scheme specific part here git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@682011 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 c26d826..a0fb276 100644 --- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java +++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
@@ -179,8 +179,7 @@ } URI tempURI = ObrUtils.findRepositoryXml( "", remoteOBR ); - String repositoryPath = tempURI.isOpaque() ? tempURI.getSchemeSpecificPart() : tempURI.getPath(); - String repositoryName = new File( repositoryPath ).getName(); + String repositoryName = new File( tempURI.getSchemeSpecificPart() ).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 88816d8..ae3e07b 100644 --- a/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java +++ b/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
@@ -146,8 +146,7 @@ } URI tempURI = ObrUtils.findRepositoryXml( "", remoteOBR ); - String repositoryPath = tempURI.isOpaque() ? tempURI.getSchemeSpecificPart() : tempURI.getPath(); - String repositoryName = new File( repositoryPath ).getName(); + String repositoryName = new File( tempURI.getSchemeSpecificPart() ).getName(); Log log = getLog(); ObrUpdate update;