svn commit: r790160 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java

[ri...@apache.org]

Author: rickhall
Date: Wed Jul  1 13:41:32 2009
New Revision: 790160

URL: http://svn.apache.org/viewvc?rev=790160&view=rev
Log:
Added support for FrameworkUtil.getBundle(). (FELIX-1289)

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/ModuleImpl.java

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=790160&r1=790159&r2=790160&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 Wed Jul  1 13:41:32 2009
@@ -28,8 +28,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLStreamHandler;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.security.ProtectionDomain;
 import java.security.SecureClassLoader;
 import java.util.ArrayList;
@@ -54,6 +52,7 @@
 import org.apache.felix.framework.util.manifestparser.Requirement;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
+import org.osgi.framework.BundleReference;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.Version;
@@ -1556,7 +1555,7 @@
         m_dexFileClassLoadClass = dexFileClassLoadClass;
     }
 
-    public class ModuleClassLoader extends SecureClassLoader
+    public class ModuleClassLoader extends SecureClassLoader implements BundleReference
     {
         private final Map m_jarContentToDexFile;
 
@@ -1573,7 +1572,12 @@
             }
         }
 
-        public IModule getModule()
+        public Bundle getBundle()
+        {
+            return ModuleImpl.this.getBundle();
+        }
+
+        IModule getModule()
         {
             return ModuleImpl.this;
         }