felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject svn commit: r705282 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
Date Thu, 16 Oct 2008 16:50:13 GMT
Author: pauls
Date: Thu Oct 16 09:50:12 2008
New Revision: 705282

URL: http://svn.apache.org/viewvc?rev=705282&view=rev
Log:
Update felix to work with the latest version of the android sdk (1.0.0.-rc1).

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

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java?rev=705282&r1=705281&r2=705282&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
(original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/searchpolicy/ContentClassLoader.java
Thu Oct 16 09:50:12 2008
@@ -43,7 +43,16 @@
         Method dexFileClassLoadClass = null;
         try
         {
-            Class dexFileClass =  Class.forName("android.dalvik.DexFile");
+            Class dexFileClass;
+            try
+            {
+                dexFileClass = Class.forName("dalvik.system.DexFile");
+            }
+            catch (Exception ex)
+            {
+                dexFileClass = Class.forName("android.dalvik.DexFile");
+            }
+            
             dexFileClassConstructor = dexFileClass.getConstructor(
                 new Class[] { java.io.File.class });
             dexFileClassLoadClass = dexFileClass.getMethod("loadClass",



Mime
View raw message