Patch: FYI: security manager, class loaders and resource bundles
Tom Tromey
tromey@redhat.com
Wed Dec 4 16:48:00 GMT 2002
I'm checking this in.
This implements a missing VMSecurityManager method.
It also updates ResourceBundle to find the appropriate class loader
more efficiently.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* Makefile.in: Rebuilt.
* Makefile.am (nat_source_files): Added natVMSecurityManager,
natResourceBundle.
* java/util/ResourceBundle.java (Security): Removed.
(getCallingClassLoader): Now native.
* java/util/natResourceBundle.cc: New file.
* java/lang/natVMSecurityManager.cc: New file.
* java/lang/VMSecurityManager.java (getClassContext): Now native.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.262
diff -u -r1.262 Makefile.am
--- Makefile.am 3 Dec 2002 13:50:05 -0000 1.262
+++ Makefile.am 4 Dec 2002 23:42:20 -0000
@@ -2337,6 +2337,7 @@
java/lang/natStringBuffer.cc \
java/lang/natSystem.cc \
java/lang/natThread.cc \
+java/lang/natVMSecurityManager.cc \
java/lang/ref/natReference.cc \
java/lang/reflect/natArray.cc \
java/lang/reflect/natConstructor.cc \
@@ -2348,6 +2349,7 @@
java/net/natPlainDatagramSocketImpl.cc \
java/net/natPlainSocketImpl.cc \
java/text/natCollator.cc \
+java/util/natResourceBundle.cc \
java/util/natTimeZone.cc \
java/util/zip/natDeflater.cc \
java/util/zip/natInflater.cc
Index: prims.cc
===================================================================
RCS file: /cvs/gcc/gcc/libjava/prims.cc,v
retrieving revision 1.75
diff -u -r1.75 prims.cc
--- prims.cc 3 Dec 2002 13:50:05 -0000 1.75
+++ prims.cc 4 Dec 2002 23:42:24 -0000
@@ -397,7 +397,7 @@
// if there really is an interesting finalizer.
// Unfortunately, we still have to the dynamic test, since there may
// be cni calls to this routine.
- // Nore that on IA64 get_finalizer() returns the starting address of the
+ // Note that on IA64 get_finalizer() returns the starting address of the
// function, not a function pointer. Thus this still works.
if (klass->vtable->get_finalizer ()
!= java::lang::Object::class$.vtable->get_finalizer ())
Index: java/lang/VMSecurityManager.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/VMSecurityManager.java,v
retrieving revision 1.1
diff -u -r1.1 VMSecurityManager.java
--- java/lang/VMSecurityManager.java 2 Sep 2001 06:18:48 -0000 1.1
+++ java/lang/VMSecurityManager.java 4 Dec 2002 23:42:26 -0000
@@ -1,6 +1,6 @@
/*
* java.lang.SecurityManager: part of the Java Class Libraries project.
- * Copyright (C) 1998, 2001 Free Software Foundation
+ * Copyright (C) 1998, 2001, 2002 Free Software Foundation
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -43,11 +43,7 @@
** @return an array containing all the methods on classes
** on the Java execution stack.
**/
- static Class[] getClassContext()
- {
- // FIXME: can't yet implement this for libgcj.
- return new Class[0];
- }
+ static native Class[] getClassContext();
/** Get the current ClassLoader--the one nearest to the
** top of the stack.
Index: java/lang/natVMSecurityManager.cc
===================================================================
RCS file: java/lang/natVMSecurityManager.cc
diff -N java/lang/natVMSecurityManager.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ java/lang/natVMSecurityManager.cc 4 Dec 2002 23:42:26 -0000
@@ -0,0 +1,54 @@
+/* Copyright (C) 2002 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+// Written by Tom Tromey <tromey@redhat.com>
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/lang/VMSecurityManager.h>
+#include <java/lang/SecurityManager.h>
+#include <java/lang/ClassLoader.h>
+#include <java/lang/Class.h>
+#include <gnu/gcj/runtime/StackTrace.h>
+
+JArray<jclass> *
+java::lang::VMSecurityManager::getClassContext ()
+{
+ JArray<jclass> *result = NULL;
+ gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace();
+ if (t)
+ {
+ int maxlen = t->length();
+
+ int len = 0;
+ while (len < maxlen)
+ {
+ jclass klass = t->classAt(len);
+ if (klass != NULL && klass != &java::lang::VMSecurityManager::class$
+ && klass != &java::lang::SecurityManager::class$)
+ ++len;
+ }
+
+ result =
+ (JArray<jclass> *) _Jv_NewObjectArray (len, &java::lang::Class::class$,
+ NULL);
+
+ len = 0;
+ while (len < maxlen)
+ {
+ jclass klass = t->classAt(len);
+ if (klass != NULL && klass != &java::lang::VMSecurityManager::class$
+ && klass != &java::lang::SecurityManager::class$)
+ elements(result)[len++] = klass;
+ }
+ }
+
+ return result;
+}
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/ResourceBundle.java,v
retrieving revision 1.20
diff -u -r1.20 ResourceBundle.java
--- java/util/ResourceBundle.java 23 Sep 2002 17:56:33 -0000 1.20
+++ java/util/ResourceBundle.java 4 Dec 2002 23:42:27 -0000
@@ -42,8 +42,6 @@
import java.lang.ref.SoftReference;
import java.io.InputStream;
import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
import gnu.classpath.Configuration;
/**
@@ -105,44 +103,7 @@
*/
private Locale locale;
- /**
- * We override SecurityManager in order to access getClassContext().
- */
- private static final class Security extends SecurityManager
- {
- /**
- * Avoid accessor method of private constructor.
- */
- Security()
- {
- }
-
- /**
- * Return the ClassLoader of the class which called into this
- * ResourceBundle, or null if it cannot be determined.
- */
- ClassLoader getCallingClassLoader()
- {
- Class[] stack = getClassContext();
- for (int i = 0; i < stack.length; i++)
- if (stack[i] != Security.class && stack[i] != ResourceBundle.class)
- return stack[i].getClassLoader();
- return null;
- }
- }
-
- /** A security context for grabbing the correct class loader. */
- private static final Security security
- = (Security) AccessController.doPrivileged(new PrivilegedAction()
- {
- // This will always work since java.util classes have (all) system
- // permissions.
- public Object run()
- {
- return new Security();
- }
- }
- );
+ private static native ClassLoader getCallingClassLoader();
/**
* The resource bundle cache. This is a two-level hash map: The key
@@ -256,7 +217,7 @@
public static final ResourceBundle getBundle(String baseName)
{
return getBundle(baseName, Locale.getDefault(),
- security.getCallingClassLoader());
+ getCallingClassLoader());
}
/**
@@ -274,7 +235,7 @@
public static final ResourceBundle getBundle(String baseName,
Locale locale)
{
- return getBundle(baseName, locale, security.getCallingClassLoader());
+ return getBundle(baseName, locale, getCallingClassLoader());
}
/**
Index: java/util/natResourceBundle.cc
===================================================================
RCS file: java/util/natResourceBundle.cc
diff -N java/util/natResourceBundle.cc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ java/util/natResourceBundle.cc 4 Dec 2002 23:42:27 -0000
@@ -0,0 +1,34 @@
+/* Copyright (C) 2002 Free Software Foundation
+
+ This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
+details. */
+
+// Written by Tom Tromey <tromey@redhat.com>
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/util/ResourceBundle.h>
+#include <java/lang/SecurityManager.h>
+#include <java/lang/ClassLoader.h>
+#include <java/lang/Class.h>
+#include <gnu/gcj/runtime/StackTrace.h>
+
+java::lang::ClassLoader *
+java::util::ResourceBundle::getCallingClassLoader ()
+{
+ gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace(6);
+ if (! t)
+ return NULL;
+ for (int i = 3; i < 6; ++i)
+ {
+ jclass klass = t->classAt(i);
+ if (klass != NULL)
+ return klass->getClassLoaderInternal();
+ }
+ return NULL;
+}
More information about the Java-patches
mailing list