You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/07/22 17:56:50 UTC
svn commit: r796776 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework: Felix.java
util/manifestparser/ManifestParser.java
Author: rickhall
Date: Wed Jul 22 15:56:50 2009
New Revision: 796776
URL: http://svn.apache.org/viewvc?rev=796776&view=rev
Log:
Ensure that partial package name wild carding does not work for
either boot delegation or dynamic imports. For boot delegation
we know treat it as part of the package name (i.e., ignore it)
and for dynamic imports we throw a parsing exception. (FELIX-1400)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java?rev=796776&r1=796775&r2=796776&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java Wed Jul 22 15:56:50 2009
@@ -321,7 +321,7 @@
for (int i = 0; i < m_bootPkgs.length; i++)
{
s = st.nextToken();
- if (s.endsWith("*"))
+ if (s.equals("*") || s.endsWith(".*"))
{
m_bootPkgWildcards[i] = true;
s = s.substring(0, s.length() - 1);
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java?rev=796776&r1=796775&r2=796776&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java Wed Jul 22 15:56:50 2009
@@ -229,6 +229,11 @@
throw new BundleException(
"Dynamically importing java.* packages not allowed: " + pkgName);
}
+ else if (pkgName.endsWith("*") && !pkgName.endsWith(".*"))
+ {
+ throw new BundleException(
+ "Partial package name wild carding is not allowed: " + pkgName);
+ }
}
//