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/08/27 15:02:36 UTC
svn commit: r808407 - in
/felix/trunk/framework/src/main/java/org/apache/felix/framework: Felix.java
ModuleImpl.java
Author: rickhall
Date: Thu Aug 27 13:02:36 2009
New Revision: 808407
URL: http://svn.apache.org/viewvc?rev=808407&view=rev
Log:
No longer need ModuleClassLoader.getModule() method. (FELIX-1289)
Modified:
felix/trunk/framework/src/main/java/org/apache/felix/framework/Felix.java
felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.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=808407&r1=808406&r2=808407&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 Thu Aug 27 13:02:36 2009
@@ -33,6 +33,7 @@
import org.apache.felix.framework.util.manifestparser.*;
import org.apache.felix.moduleloader.*;
import org.osgi.framework.*;
+import org.osgi.framework.BundleReference;
import org.osgi.framework.hooks.service.*;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.startlevel.StartLevel;
@@ -2938,13 +2939,13 @@
**/
Bundle getBundle(Class clazz)
{
- if (clazz.getClassLoader() instanceof ModuleClassLoader)
+ if (clazz.getClassLoader() instanceof BundleReference)
{
// Only return the bundle if it is from this framework.
- ModuleImpl module = (ModuleImpl)
- ((ModuleClassLoader) clazz.getClassLoader()).getModule();
- return (((BundleImpl) module.getBundle()).getFramework() == this)
- ? module.getBundle() : null;
+ BundleReference br = (BundleReference) clazz.getClassLoader();
+ return ((br.getBundle() instanceof BundleImpl)
+ && (((BundleImpl) br.getBundle()).getFramework() == this))
+ ? br.getBundle() : null;
}
try
{
Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java?rev=808407&r1=808406&r2=808407&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java Thu Aug 27 13:02:36 2009
@@ -1596,11 +1596,6 @@
return ModuleImpl.this.getBundle();
}
- IModule getModule()
- {
- return ModuleImpl.this;
- }
-
protected Class loadClass(String name, boolean resolve)
throws ClassNotFoundException
{