mono
/
ikvm-fork
зеркало из https://github.com/mono/ikvm-fork.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

- Updated java.lang.ClassLoader to OpenJDK 7 (minus PerfCounter and parallel class loading support) 

Switched to 7:
- java.util.Collections
- sun.misc.ClassFileTransformer
- sun.misc.Launcher

Added from 7:
- java.lang.SafeVargs
This commit is contained in:
jfrijters 2011-06-19 10:49:00 +00:00
Родитель 6d381ee6fe
Коммит 7a1aa6db70
4 изменённых файлов: 446 добавлений и 277 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
openjdk/allsources.lst
Просмотреть файл

@ -8624,6 +8624,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/lang/Runtime.java
@OPENJDK6@/jdk/src/share/classes/java/lang/RuntimeException.java
@OPENJDK6@/jdk/src/share/classes/java/lang/RuntimePermission.java
@OPENJDK7@/jdk/src/share/classes/java/lang/SafeVarargs.java
@OPENJDK6@/jdk/src/share/classes/java/lang/SecurityException.java
@OPENJDK6@/jdk/src/share/classes/java/lang/SecurityManager.java
@OPENJDK6@/jdk/src/share/classes/java/lang/Short.java
@ -9082,7 +9083,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/java/util/BitSet.java
@OPENJDK6@/jdk/src/share/classes/java/util/Calendar.java
@OPENJDK6@/jdk/src/share/classes/java/util/Collection.java
@OPENJDK6@/jdk/src/share/classes/java/util/Collections.java
@OPENJDK7@/jdk/src/share/classes/java/util/Collections.java
@OPENJDK6@/jdk/src/share/classes/java/util/Comparator.java
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/AbstractExecutorService.java
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/ArrayBlockingQueue.java
@ -11320,7 +11321,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/CEStreamExhausted.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/CharacterDecoder.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/CharacterEncoder.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/ClassFileTransformer.java
@OPENJDK7@/jdk/src/share/classes/sun/misc/ClassFileTransformer.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/ClassLoaderUtil.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/Cleaner.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/Compare.java
@ -11350,7 +11351,7 @@ sun/security/jgss/wrapper/SunNativeProvider.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/JavaSecurityAccess.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/JavaSecurityProtectionDomainAccess.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/JavaUtilJarAccess.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/Launcher.java
@OPENJDK7@/jdk/src/share/classes/sun/misc/Launcher.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/Lock.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/LRUCache.java
@OPENJDK6@/jdk/src/share/classes/sun/misc/MessageUtils.java

695
openjdk/java/lang/ClassLoader.java
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

2
openjdk/response.txt
Просмотреть файл

@ -90,6 +90,7 @@ assembly.class
@OPENJDK6@/jdk/src/share/classes/java/security/cert/*.class
@OPENJDK6@/jdk/src/share/classes/java/sql/Timestamp.class
@OPENJDK6@/jdk/src/share/classes/java/util/*.class
@OPENJDK7@/jdk/src/share/classes/java/util/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/atomic/*.class
@OPENJDK6@/jdk/src/share/classes/java/util/concurrent/locks/*.class
@ -98,6 +99,7 @@ assembly.class
@OPENJDK6@/jdk/src/share/classes/java/util/regex/*.class
@OPENJDK6@/jdk/src/share/classes/javax/net/*.class
@OPENJDK6@/jdk/src/share/classes/sun/misc/*.class
@OPENJDK7@/jdk/src/share/classes/sun/misc/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/ftp/*.class
@OPENJDK6@/jdk/src/share/classes/sun/net/idn/*.class

19
runtime/openjdk.cs
Просмотреть файл

@ -2942,10 +2942,6 @@ namespace IKVM.NativeCode.java
static class ClassLoader
{
#if !FIRST_PASS
private static jlClassNotFoundException classNotFoundException;
#endif
public static object defineClass0(jlClassLoader thisClassLoader, string name, byte[] b, int off, int len, object pd)
{
return defineClass1(thisClassLoader, name, b, off, len, pd, null);
@ -3016,20 +3012,7 @@ namespace IKVM.NativeCode.java
{
throw x.ToJava();
}
if (tw == null)
{
// HACK for efficiency, we don't allocate a new exception here
// (as this exception is thrown for *every* non-boot class that we load and
// the exception is thrown away by our caller anyway)
if (classNotFoundException == null)
{
jlClassNotFoundException ex = new jlClassNotFoundException(null, null);
ex.setStackTrace(new jlStackTraceElement[] { new jlStackTraceElement("java.lang.ClassLoader", "findBootstrapClass", null, -2) });
classNotFoundException = ex;
}
throw classNotFoundException;
}
return tw.ClassObject;
return tw != null ? tw.ClassObject : null;
#endif
}