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/01 21:19:30 UTC
svn commit: r790324 -
/felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
Author: rickhall
Date: Wed Jul 1 19:19:30 2009
New Revision: 790324
URL: http://svn.apache.org/viewvc?rev=790324&view=rev
Log:
Make sure we return null for PackageAdmin.getBundle(Class) when
the bundle is from a different framework. (FELIX-1292)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.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=790324&r1=790323&r2=790324&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 1 19:19:30 2009
@@ -3055,9 +3055,11 @@
{
if (clazz.getClassLoader() instanceof ModuleClassLoader)
{
- IModule module =
+ // Only return the bundle if it is from this framework.
+ ModuleImpl module = (ModuleImpl)
((ModuleClassLoader) clazz.getClassLoader()).getModule();
- return module.getBundle();
+ return (((BundleImpl) module.getBundle()).getFramework() == this)
+ ? module.getBundle() : null;
}
try
{