procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natVMSecurityManager.cc (getClassContext): Add new arg: klass.

Browse source 
2005-03-17  Andrew Haley  <aph@redhat.com>

	* java/lang/natVMSecurityManager.cc (getClassContext): Add new
	arg: klass.
	Pass klass to _Jv_StackTrace::GetClassContext().
	* java/lang/ClassLoader.java (getParent): Pass class to
	VMSecurityManager.getClassContext()
	(getSystemClassLoader): Likewise.
	* java/lang/Package.java (getPackage): Likewise.
	(getPackages): Likewise.
	* java/lang/SecurityManager.java (getClassContext): Likewise.
	(currentClassLoader): Likewise.
	* java/lang/VMSecurityManager.java: (getClassContext): Likewise.
	(currentClassLoader) Add new arg: caller.
	Pass caller to VMSecurityManager.getClassContext.

	* stacktrace.cc (GetClassContext): Correct calculation of
	jframe_count.

	* boehm.cc (_Jv_MarkObj): (_Jv_MarkObj): Mark
	im->source_file_name.

From-SVN: r96803
This commit is contained in:
Andrew Haley 2005-03-21 14:50:14 +00:00 • committed by Andrew Haley
parent 21e01bf10d
commit e5a8980bb9
8 changed files with 45 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libjava/java/lang/VMSecurityManager.java
View file

@ -43,19 +43,19 @@ class VMSecurityManager
** @return an array containing all the methods on classes
** on the Java execution stack.
**/
static native Class[] getClassContext();
static native Class[] getClassContext(Class caller);
/** Get the current ClassLoader--the one nearest to the
** top of the stack.
** @return the current ClassLoader.
**/
static ClassLoader currentClassLoader()
static ClassLoader currentClassLoader(Class caller)
{
// The docs above are wrong. See the online docs.
// FIXME this implementation is a bit wrong too -- the docs say we
// must also consider ancestors of the system class loader.
ClassLoader systemClassLoader = VMClassLoader.getSystemClassLoader();
Class[] classStack = getClassContext ();
Class[] classStack = getClassContext (caller);
for (int i = 0; i < classStack.length; i++)
{
ClassLoader loader = classStack[i].getClassLoader();