You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2011/11/08 16:12:34 UTC
svn commit: r1199279 -
/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
Author: mnuttall
Date: Tue Nov 8 15:12:33 2011
New Revision: 1199279
URL: http://svn.apache.org/viewvc?rev=1199279&view=rev
Log:
ARIES-774: Problem modelling nested bundles - strip off leading /s for bpParser.isBPFile
Modified:
aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
Modified: aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java?rev=1199279&r1=1199278&r2=1199279&view=diff
==============================================================================
--- aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java (original)
+++ aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java Tue Nov 8 15:12:33 2011
@@ -237,6 +237,9 @@ public class ModelledResourceManagerImpl
// /bundleFileName.jar from the front of the directory.
int bundleNameLength = bundle.getName().length();
directoryName = directoryFullPath.substring(bundleNameLength, directoryFullPath.lastIndexOf("/"));
+ if (directoryName.startsWith("/") && directoryName.length() > 1) {
+ directoryName = directoryName.substring(1);
+ }
fileName = directoryFullPath.substring(directoryFullPath.lastIndexOf("/") + 1);
} else {
if (file.isFile()) {