You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rs...@apache.org on 2008/03/14 18:58:11 UTC

svn commit: r637184 - /incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java

Author: rsivaram
Date: Fri Mar 14 10:58:07 2008
New Revision: 637184

URL: http://svn.apache.org/viewvc?rev=637184&view=rev
Log:
Fix getBundleFileName when bundle is a directory

Modified:
    incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java

Modified: incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java?rev=637184&r1=637183&r2=637184&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java Fri Mar 14 10:58:07 2008
@@ -131,6 +131,8 @@
     private String getBundleFileName(Object bundle) {
         if (bundle instanceof Bundle) {
             String path = ((Bundle)bundle).getLocation();
+            if (path.endsWith("/"))
+                path = path.substring(0, path.length()-1);
             if (path.startsWith(contribution.getLocation())) {
                 if (path.equals(contribution.getLocation())) {
                     int index = path.lastIndexOf('/');
@@ -141,7 +143,7 @@
                     if (path.startsWith("/"))
                         path = path.substring(1);
                 }
-            } else if (path.lastIndexOf('/') > 0)
+            } else if (path.lastIndexOf('/') >= 0)
                 path = path.substring(path.lastIndexOf('/')+1);
             return path;
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org