[Jnode-svn-commits] SF.net SVN: jnode: [3470] trunk/core/src

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

Revision: 3470
          http://jnode.svn.sourceforge.net/jnode/?rev=3470&view=rev
Author:   lsantha
Date:     2007-09-08 09:43:35 -0700 (Sat, 08 Sep 2007)

Log Message:
-----------
openjdk integration

Modified Paths:
--------------
    trunk/core/src/classpath/java/java/security/AccessController.java
    trunk/core/src/classpath/vm/java/lang/ClassLoader.java
    trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java

Modified: trunk/core/src/classpath/java/java/security/AccessController.java
===================================================================
--- trunk/core/src/classpath/java/java/security/AccessController.java	2007-09-08 12:09:23 UTC (rev 3469)
+++ trunk/core/src/classpath/java/java/security/AccessController.java	2007-09-08 16:43:35 UTC (rev 3470)
@@ -113,10 +113,10 @@
    * domains should be added to the protection domain of the calling class.
    * @return the result of the <code>action.run()</code> method.
      */
-    public static Object doPrivileged(PrivilegedAction action,
+    public static <T> T doPrivileged(PrivilegedAction<T> action,
                                     AccessControlContext context)
   {
-        return VmAccessController.doPrivileged(action, context.getVmContext());
+        return (T) VmAccessController.doPrivileged(action, context.getVmContext());
     }
 
     /**

Modified: trunk/core/src/classpath/vm/java/lang/ClassLoader.java
===================================================================
--- trunk/core/src/classpath/vm/java/lang/ClassLoader.java	2007-09-08 12:09:23 UTC (rev 3469)
+++ trunk/core/src/classpath/vm/java/lang/ClassLoader.java	2007-09-08 16:43:35 UTC (rev 3470)
@@ -201,7 +201,7 @@
      * 
      * @param vmClassLoader
      */
-    protected ClassLoader(VmSystemClassLoader vmClassLoader) {
+    protected ClassLoader(VmSystemClassLoader vmClassLoader, int discriminator) {
         /* May we create a new classloader? */
         SecurityManager sm = System.getSecurityManager();
         if (sm != null) {

Modified: trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java
===================================================================
--- trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java	2007-09-08 12:09:23 UTC (rev 3469)
+++ trunk/core/src/core/org/jnode/vm/VmSystemClassLoader.java	2007-09-08 16:43:35 UTC (rev 3470)
@@ -764,7 +764,7 @@
     	private final VmSystemClassLoader vmClassLoader;
     	
         public ClassLoaderWrapper(VmSystemClassLoader vmClassLoader) {
-            super(vmClassLoader);
+            super(vmClassLoader, 0);
             this.vmClassLoader = vmClassLoader;
         }
         


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