commit 62db4b5f44845c5119e8ea8684054105b32fbc82
author Clement Escoffier <clement@apache.org> Mon Sep 28 19:03:48 2009 +0000
committer Clement Escoffier <clement@apache.org> Mon Sep 28 19:03:48 2009 +0000
tree 4521f756bf1b35637437d60437ccad0d7bfdef23
parent d54c50e0965884c0f33ce379e1e43148b70608f5

Commit a basic fix for FELIX-1650. Remove ;singleton:=true from the symbolic name during the local repository computation. 


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@819671 13f79535-47bb-0310-9956-ffa450edef68

bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java

diff --git a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
index 6c3eee3..8dad29b 100644
--- a/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
+++ b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
@@ -291,7 +291,13 @@
                 String key = (String) keys.nextElement();
                 if (key.equalsIgnoreCase(Constants.BUNDLE_SYMBOLICNAME))
                 {
-                    put(Resource.SYMBOLIC_NAME, (String) dict.get(key));
+                    String sn = (String) dict.get(key);
+                    sn = sn.trim();
+                    int index = sn.indexOf(";singleton:=true");
+                    if (index != -1) {
+                        sn = sn.substring(0, index);
+                    }
+                    put(Resource.SYMBOLIC_NAME, sn);    
                 }
                 else if (key.equalsIgnoreCase(Constants.BUNDLE_NAME))
                 {
@@ -445,4 +451,4 @@
         }
 
     }
-}
\ No newline at end of file
+}