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

prims.cc (_Jv_NewObjectArray): Undo placement change.

Browse source 
2000-11-25  Anthony Green  <green@redhat.com>

	* prims.cc (_Jv_NewObjectArray): Undo placement change.
	(_Jv_NewPrimArray): Likewise.
	* gcj/array.h (__JArray): Undo const change.  Removed constructor.
	(class JArray): Removed constructor.

	* java/lang/Thread.java (context_class_loader): New private data.
	(getContextClassLoader): New method.
	(setContextClassLoader): New method.
	(Thread): Initialize context_class_loader.

	* java/net/URLClassLoader.java: Import java.util.Enumeration.
	(getResource): Rename to findResource.
	(findResource): New method.  Used to be getResource.
	(getResourceAsStream): Deleted.
	(jarFileize): Extracted logic from URLClassLoader constructor into
	this new private method.
	(addURL): New protected method.
	(URLClassLoader): Call jarFileize.  Use addElement instead of
	insertElementAt.
	(findResources): New method.

	* java/lang/ClassLoader.java: Import java.util.Enumeration.
	(getResource): Implement correct logic.
	(findResource): New method.
	(getResources): New method.
	(findClass): Create a ClassNotFoundException with the name of the
	class rather than nothing at all.
	(defineClass) Only throw ClassFormatError.

	* java/lang/Class.java (forName): New method.
	* java/lang/Class.h (forName): New method.
	* java/lang/natClass.cc (forName): New method.

From-SVN: r37751
This commit is contained in:
Anthony Green 2000-11-26 03:58:56 +00:00
parent 1786009e06
commit 31280fb7c4
8 changed files with 206 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libjava/java/lang/Class.h
View file

@ -103,6 +103,7 @@ struct _Jv_ifaces
class java::lang::Class : public java::lang::Object
{
public:
static jclass forName (jstring className, java::lang::ClassLoader *loader);
static jclass forName (jstring className);
JArray<jclass> *getClasses (void);

2
libjava/java/lang/Class.java
View file

@ -30,6 +30,8 @@ public final class Class implements Serializable
{
public static native Class forName (String className)
throws ClassNotFoundException;
public static native Class forName (String className, ClassLoader loader)
throws ClassNotFoundException;
public native Class[] getClasses ();
public native ClassLoader getClassLoader ();
public native Class getComponentType ();

76
libjava/java/lang/ClassLoader.java
View file

@ -11,8 +11,10 @@ details. */
package java.lang;
import java.io.InputStream;
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
import java.util.Enumeration;
import java.util.Stack;
/**
@ -132,7 +134,7 @@ public abstract class ClassLoader {
protected Class findClass (String name)
throws ClassNotFoundException
{
throw new ClassNotFoundException ();
throw new ClassNotFoundException (name);
}
/**
@ -154,7 +156,7 @@ public abstract class ClassLoader {
* @exception java.lang.LinkageError
* @see ClassLoader#defineClass(String,byte[],int,int) */
protected final Class defineClass(byte[] data, int off, int len)
throws java.lang.ClassNotFoundException, java.lang.LinkageError
throws ClassFormatError
{
return defineClass (null, data, off, len);
}
@ -188,7 +190,7 @@ public abstract class ClassLoader {
byte[] data,
int off,
int len)
throws java.lang.ClassNotFoundException, java.lang.LinkageError
throws ClassFormatError
{
if (data==null || data.length < off+len || off<0 || len<0)
throw new ClassFormatError ("arguments to defineClass "
@ -207,10 +209,7 @@ public abstract class ClassLoader {
return defineClass0 (name, data, off, len);
} catch (java.lang.LinkageError x) {
throw x; // rethrow
} catch (java.lang.ClassNotFoundException x) {
} catch (ClassFormatError x) {
throw x; // rethrow
} catch (java.lang.VirtualMachineError x) {
@ -223,7 +222,7 @@ public abstract class ClassLoader {
+ "while defining class "
+ name + ": "
+ x.toString ());
}
}
}
/** This is the entry point of defineClass into the native code */
@ -231,7 +230,7 @@ public abstract class ClassLoader {
byte[] data,
int off,
int len)
throws java.lang.ClassNotFoundException, java.lang.LinkageError;
throws ClassFormatError;
/**
@ -356,8 +355,8 @@ public abstract class ClassLoader {
if (res == null) return null;
return res.openStream ();
} catch (java.io.IOException x) {
return null;
}
return null;
}
}
/**
@ -369,9 +368,62 @@ public abstract class ClassLoader {
* @see java.lang.ClassLoader#getResourceAsStream(String)
* @see java.io.URL
*/
public URL getResource(String name) {
public URL getResource (String name)
{
// The rules say search the parent class if non-null,
// otherwise search the built-in class loader (assumed to be
// the system ClassLoader). If not found, call
// findResource().
URL result = null;
ClassLoader delegate = parent;
if (delegate == null)
delegate = getSystemClassLoader ();
// Protect ourselves from looping.
if (this != delegate)
result = delegate.getResource (name);
if (result != null)
return result;
else
return findResource (name);
}
protected URL findResource (String name)
{
// Default to returning null. Derived classes implement this.
return null;
}
public Enumeration getResources (String name) throws IOException
{
// The rules say search the parent class if non-null,
// otherwise search the built-in class loader (assumed to be
// the system ClassLoader). If not found, call
// findResource().
Enumeration result = null;
ClassLoader delegate = parent;
if (delegate == null)
delegate = getSystemClassLoader ();
// Protect ourselves from looping.
if (this != delegate)
result = delegate.getResources (name);
if (result != null)
return result;
else
return findResources (name);
}
protected Enumeration findResources (String name) throws IOException
{
// Default to returning null. Derived classes implement this.
return null;
}
}

30
libjava/java/lang/Thread.java
View file

@ -145,15 +145,23 @@ public class Thread implements Runnable
daemon_flag = status;
}
// TODO12:
// public ClassLoader getContextClassLoader()
// {
// }
public ClassLoader getContextClassLoader()
{
if (context_class_loader == null)
{
context_class_loader = ClassLoader.getSystemClassLoader ();
return context_class_loader;
}
// TODO12:
// public void setContextClassLoader(ClassLoader cl)
// {
// }
// FIXME: Add security manager stuff here.
return context_class_loader;
}
public void setContextClassLoader(ClassLoader cl)
{
// FIXME: Add security manager stuff here.
context_class_loader = cl;
}
public final void setName (String n)
{
@ -227,13 +235,14 @@ public class Thread implements Runnable
interrupt_flag = false;
alive_flag = false;
startable_flag = true;
if (current != null)
{
daemon_flag = current.isDaemon();
int gmax = group.getMaxPriority();
int pri = current.getPriority();
priority = (gmax < pri ? gmax : pri);
context_class_loader = current.context_class_loader;
}
else
{
@ -277,7 +286,7 @@ public class Thread implements Runnable
public String toString ()
{
return "Thread[" + name + "," + priority + "," +
(group == null ? "" : group.getName()) + "]";
(group == null ? "" : group.getName()) + "]";
}
public static native void yield ();
@ -291,6 +300,7 @@ public class Thread implements Runnable
boolean interrupt_flag;
private boolean alive_flag;
private boolean startable_flag;
private ClassLoader context_class_loader;
// Our native data.
private Object data;

19
libjava/java/lang/natClass.cc
View file

@ -72,7 +72,7 @@ static _Jv_Utf8Const *finit_leg_name = _Jv_makeUtf8Const ("$finit$", 7);
jclass
java::lang::Class::forName (jstring className)
java::lang::Class::forName (jstring className, java::lang::ClassLoader *loader)
{
if (! className)
JvThrow (new java::lang::NullPointerException);
@ -85,10 +85,10 @@ java::lang::Class::forName (jstring className)
// IllegalArgumentException on failure.
_Jv_Utf8Const *name = _Jv_makeUtf8Const (buffer, length);
// FIXME: should use class loader from calling method.
// FIXME: should use bootstrap class loader if loader is null.
jclass klass = (buffer[0] == '['
? _Jv_FindClassFromSignature (name->data, NULL)
: _Jv_FindClass (name, NULL));
? _Jv_FindClassFromSignature (name->data, loader)
: _Jv_FindClass (name, loader));
if (klass)
_Jv_InitClass (klass);
@ -98,6 +98,13 @@ java::lang::Class::forName (jstring className)
return klass;
}
jclass
java::lang::Class::forName (jstring className)
{
// FIXME: should use class loader from calling method.
return forName (className, NULL);
}
java::lang::reflect::Constructor *
java::lang::Class::getConstructor (JArray<jclass> *param_types)
{
@ -608,7 +615,7 @@ java::lang::Class::getMethods (void)
return result;
}
jboolean
inline jboolean
java::lang::Class::isAssignableFrom (jclass klass)
{
// Arguments may not have been initialized, given ".class" syntax.
@ -899,7 +906,7 @@ _Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
return cldt->cls.itable[idx];
}
inline jboolean
jboolean
_Jv_IsAssignableFrom (jclass target, jclass source)
{
if (target == &ObjectClass