[Jnode-svn-commits] SF.net SVN: jnode:[5336] trunk

[<ls...@us...>]

Revision: 5336
          http://jnode.svn.sourceforge.net/jnode/?rev=5336&view=rev
Author:   lsantha
Date:     2009-04-22 19:10:02 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
Fixed regression in isolate startup.

Modified Paths:
--------------
    trunk/all/conf/openjdk-annotations.properties
    trunk/all/lib/classlib-src.jar.bz2
    trunk/all/lib/classlib.pack.gz
    trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java

Modified: trunk/all/conf/openjdk-annotations.properties
===================================================================
--- trunk/all/conf/openjdk-annotations.properties	2009-04-22 18:45:00 UTC (rev 5335)
+++ trunk/all/conf/openjdk-annotations.properties	2009-04-22 19:10:02 UTC (rev 5336)
@@ -12,6 +12,7 @@
 java/awt/Toolkit.class=SharedStatics
 java/io/VMIOUtils.class=SharedStatics
 java/lang/Thread.class=SharedStatics
+java/lang/Class.class=SharedStatics
 java/lang/ThreadLocal.class=SharedStatics
 java/lang/Throwable.class=MagicPermission
 java/net/InetAddress.class=SharedStatics
@@ -35,3 +36,4 @@
 sun/misc/SharedSecrets.class=SharedStatics
 sun/misc/Unsafe.class=SharedStatics,MagicPermission
 sun/misc/VM.class=SharedStatics
+sun/reflect/ReflectionFactory.class=SharedStatics

Modified: trunk/all/lib/classlib-src.jar.bz2
===================================================================
(Binary files differ)

Modified: trunk/all/lib/classlib.pack.gz
===================================================================
(Binary files differ)

Modified: trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java	2009-04-22 18:45:00 UTC (rev 5335)
+++ trunk/core/src/core/org/jnode/vm/isolate/VmIsolate.java	2009-04-22 19:10:02 UTC (rev 5336)
@@ -55,6 +55,7 @@
 import org.jnode.vm.classmgr.VmIsolatedStatics;
 import org.jnode.vm.classmgr.VmType;
 import org.jnode.vm.scheduler.VmThread;
+import gnu.classpath.SystemProperties;
 
 /**
  * VM specific implementation of the Isolate class.
@@ -960,15 +961,10 @@
             //executorThread = new Thread(new TaskExecutor(), "isolate-executor");
             //executorThread.start();
 
-            // Find main method
-            final Method mainMethod = cls.getMethod("main",
-                new Class[]{String[].class});
-//                IsolatedStaticData.mainTypes);
-
             //inherit properties
             AccessController.doPrivileged(new PrivilegedAction<Object>() {
                 public Object run() {
-                    Properties sys_porps = System.getProperties();
+                    Properties sys_porps = SystemProperties.getProperties();
                     for (String prop : initProperties.stringPropertyNames()) {
                         sys_porps.setProperty(prop, initProperties.getProperty(prop));
                     }
@@ -976,6 +972,12 @@
                 }
             });
 
+            // Find main method
+            final Method mainMethod = cls.getMethod("main",
+                new Class[]{String[].class});
+//                IsolatedStaticData.mainTypes);
+
+
             //create the appcontext for this isolate
             // TODO - improve this
             //appContext = Class.forName("sun.awt.SunToolkit").getMethod("createNewAppContext").invoke(null);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.