commit e62caf5f931cd7deb56f1646fd345b0e13222c51
author Richard S. Hall <rickhall@apache.org> Wed Jan 24 19:37:30 2007 +0000
committer Richard S. Hall <rickhall@apache.org> Wed Jan 24 19:37:30 2007 +0000
tree 2066fd998cea3d0596c2f20f294f0927dcf83b26
parent ae478dc1a63b75e6a4898df079b63f1e100db661

Fixed another issue with the dynamic import optimization patch.


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

framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java

diff --git a/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
index 7545461..c1837f4 100755
--- a/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
+++ b/framework/src/main/java/org/apache/felix/framework/searchpolicy/R4SearchPolicyCore.java
@@ -509,10 +509,10 @@
                 String dynPkgName = ((Requirement) dynamics[i]).getPackageName();
                 boolean wildcard = (dynPkgName.lastIndexOf(".*") >= 0);
                 dynPkgName = (wildcard)
-                    ? dynPkgName.substring(0, dynPkgName.length() - 1) : dynPkgName;
+                    ? dynPkgName.substring(0, dynPkgName.length() - 2) : dynPkgName;
                 if (dynPkgName.equals("*") ||
                     pkgName.equals(dynPkgName) ||
-                    (wildcard && pkgName.startsWith(dynPkgName)))
+                    (wildcard && pkgName.startsWith(dynPkgName + ".")))
                 {
                     // Constrain the current dynamic requirement to include
                     // the precise package name for which we are searching; this