From b9f42bb06092d78b84964ce1ce3af703bad2cc7d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Thu, 25 Sep 2003 07:46:19 +0000
Subject: Proxy.java (generate): Uncomment protection domain code.

	* java/lang/reflect/Proxy.java (generate): Uncomment protection
	domain code.
	* java/lang/natClassLoader.cc (defineClass): Added `loader'
	argument.
	(linkClass0): Now in VMClassLoader.
	(markClassErrorState0): Likewise.
	(getSystemClassLoaderInternal): New method.
	* java/lang/natClass.cc (initializeClass): Use
	VMClassLoader::resolveClass.
	* java/lang/ClassLoader.java: New version, from Classpath.
	* java/lang/Class.java (getProtectionDomain):
	protectionDomainPermission and unknownProtectionDomain now in
	VMClassLoader.
	* java/lang/Class.h: VMClassLoader now a friend class.
	* gnu/gcj/runtime/VMClassLoader.java (instance): Now
	package-private.
	* gcj/javaprims.h: Regenerated class list.
	* resolve.cc (_Jv_PrepareClass): Use VMClassLoader::resolveClass.
	* java/lang/VMClassLoader.java: New version from Classpath;
	modified for libgcj use.

From-SVN: r71765
---
 libjava/java/lang/Class.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'libjava/java/lang/Class.java')

diff --git a/libjava/java/lang/Class.java b/libjava/java/lang/Class.java
index bd77691..86d52be 100644
--- a/libjava/java/lang/Class.java
+++ b/libjava/java/lang/Class.java
@@ -227,12 +227,12 @@ public final class Class implements Serializable
   {
     SecurityManager sm = System.getSecurityManager();
     if (sm != null)
-      sm.checkPermission(ClassLoader.protectionDomainPermission);
+      sm.checkPermission(VMClassLoader.protectionDomainPermission);
     
     ProtectionDomain protectionDomain = getProtectionDomain0();
 
     if (protectionDomain == null)
-      return ClassLoader.unknownProtectionDomain;
+      return VMClassLoader.unknownProtectionDomain;
     else
       return protectionDomain;
   }
-- 
cgit v1.1