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/04 12:18:50 UTC
svn commit: r1197508 -
/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
Author: mnuttall
Date: Fri Nov 4 11:18:50 2011
New Revision: 1197508
URL: http://svn.apache.org/viewvc?rev=1197508&view=rev
Log:
ARIES-774: Problem modelling nested bundles
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=1197508&r1=1197507&r2=1197508&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 Fri Nov 4 11:18:50 2011
@@ -233,7 +233,10 @@ public class ModelledResourceManagerImpl
String directoryName = "";
String fileName = "";
if (directoryFullPath.lastIndexOf("/") != -1) {
- directoryName = directoryFullPath.substring(0, directoryFullPath.lastIndexOf("/"));
+ // This bundle may be nested within another archive. In that case, we need to trim
+ // /bundleFileName.jar from the front of the directory.
+ int bundleNameLength = bundle.getName().length();
+ directoryName = directoryFullPath.substring(bundleNameLength, directoryFullPath.lastIndexOf("/"));
fileName = directoryFullPath.substring(directoryFullPath.lastIndexOf("/") + 1);
} else {
if (file.isFile()) {