+2002-12-04 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.
+
2002-12-03 Mark Wielaard <mark@klomp.org>
* java/util/jar/JarFile.java (manifest): Not final.
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 \
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
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 \
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
java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \
java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \
java/lang/natStringBuffer.lo java/lang/natSystem.lo \
-java/lang/natThread.lo java/lang/ref/natReference.lo \
-java/lang/reflect/natArray.lo java/lang/reflect/natConstructor.lo \
-java/lang/reflect/natField.lo java/lang/reflect/natMethod.lo \
-java/lang/reflect/natProxy.lo java/net/natNetworkInterface.lo \
-java/net/natInetAddress.lo java/net/natPlainDatagramSocketImpl.lo \
-java/net/natPlainSocketImpl.lo java/text/natCollator.lo \
+java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
+java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
+java/lang/reflect/natConstructor.lo java/lang/reflect/natField.lo \
+java/lang/reflect/natMethod.lo java/lang/reflect/natProxy.lo \
+java/net/natNetworkInterface.lo java/net/natInetAddress.lo \
+java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \
+java/text/natCollator.lo java/util/natResourceBundle.lo \
java/util/natTimeZone.lo java/util/zip/natDeflater.lo \
java/util/zip/natInflater.lo
libgcjx_la_OBJECTS = gnu/gcj/xlib/natClip.lo \
.deps/java/lang/natMath.P .deps/java/lang/natObject.P \
.deps/java/lang/natRuntime.P .deps/java/lang/natString.P \
.deps/java/lang/natStringBuffer.P .deps/java/lang/natSystem.P \
-.deps/java/lang/natThread.P .deps/java/lang/ref/PhantomReference.P \
-.deps/java/lang/ref/Reference.P .deps/java/lang/ref/ReferenceQueue.P \
+.deps/java/lang/natThread.P .deps/java/lang/natVMSecurityManager.P \
+.deps/java/lang/ref/PhantomReference.P .deps/java/lang/ref/Reference.P \
+.deps/java/lang/ref/ReferenceQueue.P \
.deps/java/lang/ref/SoftReference.P .deps/java/lang/ref/WeakReference.P \
.deps/java/lang/ref/natReference.P \
.deps/java/lang/reflect/AccessibleObject.P \
.deps/java/util/jar/JarException.P .deps/java/util/jar/JarFile.P \
.deps/java/util/jar/JarInputStream.P \
.deps/java/util/jar/JarOutputStream.P .deps/java/util/jar/Manifest.P \
-.deps/java/util/natTimeZone.P .deps/java/util/regex/Matcher.P \
-.deps/java/util/regex/Pattern.P \
+.deps/java/util/natResourceBundle.P .deps/java/util/natTimeZone.P \
+.deps/java/util/regex/Matcher.P .deps/java/util/regex/Pattern.P \
.deps/java/util/regex/PatternSyntaxException.P \
.deps/java/util/zip/Adler32.P .deps/java/util/zip/CRC32.P \
.deps/java/util/zip/CheckedInputStream.P \
/*
* 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
** @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.
--- /dev/null
+/* 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;
+}
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;
/**
*/
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
public static final ResourceBundle getBundle(String baseName)
{
return getBundle(baseName, Locale.getDefault(),
- security.getCallingClassLoader());
+ getCallingClassLoader());
}
/**
public static final ResourceBundle getBundle(String baseName,
Locale locale)
{
- return getBundle(baseName, locale, security.getCallingClassLoader());
+ return getBundle(baseName, locale, getCallingClassLoader());
}
/**
--- /dev/null
+/* 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;
+}
// 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 ())
projects / platform / upstream / linaro-gcc.git / commitdiff