felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mccu...@apache.org
Subject svn commit: r682011 - in /felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin: ObrDeploy.java ObrDeployFile.java
Date Sat, 02 Aug 2008 16:50:32 GMT
Author: mcculls
Date: Sat Aug  2 09:50:31 2008
New Revision: 682011

URL: http://svn.apache.org/viewvc?rev=682011&view=rev
Log:
FELIX-553: actually safer to always use scheme specific part here

Modified:
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
    felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java?rev=682011&r1=682010&r2=682011&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeploy.java Sat Aug
 2 09:50:31 2008
@@ -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;

Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java?rev=682011&r1=682010&r2=682011&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/obrplugin/ObrDeployFile.java Sat
Aug  2 09:50:31 2008
@@ -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;



Mime
View raw message