X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fnative%2Fvm%2Fjava_lang_ClassLoader.c;h=0e17e73a8b6ac283d79ad0a0470203083ca7bcf7;hb=9f859ad50d3d5d98c185d40b86b2179bc4dc9aeb;hp=d51687bd98c052913fa9ccaaac99b769f23972e1;hpb=910cbf961bf0e79bff9bcb1a9ddc59f5169d5555;p=cacao.git

diff --git a/src/native/vm/java_lang_ClassLoader.c b/src/native/vm/java_lang_ClassLoader.c
index d51687bd9..0e17e73a8 100644
--- a/src/native/vm/java_lang_ClassLoader.c
+++ b/src/native/vm/java_lang_ClassLoader.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: java_lang_VMClass.c 6131 2006-12-06 22:15:57Z twisti $
-
 */
 
 
@@ -74,7 +72,7 @@
  * Method:    defineClass
  * Signature: (Ljava/lang/ClassLoader;Ljava/lang/String;[BIILjava/security/ProtectionDomain;)Ljava/lang/Class;
  */
-java_lang_Class *_Jv_java_lang_ClassLoader_defineClass(java_lang_ClassLoader *cl, java_lang_String *name, java_bytearray *data, s4 offset, s4 len, java_security_ProtectionDomain *pd)
+java_lang_Class *_Jv_java_lang_ClassLoader_defineClass(java_lang_ClassLoader *cl, java_lang_String *name, java_handle_bytearray_t *data, s4 offset, s4 len, java_security_ProtectionDomain *pd)
 {
 	classloader     *loader;
 	utf             *utfname;
@@ -97,7 +95,7 @@ java_lang_Class *_Jv_java_lang_ClassLoader_defineClass(java_lang_ClassLoader *cl
 
 	/* check the indexes passed */
 
-	if ((offset < 0) || (len < 0) || ((offset + len) > data->header.size)) {
+	if ((offset < 0) || (len < 0) || ((offset + len) > LLNI_array_size(data))) {
 		exceptions_throw_arrayindexoutofboundsexception();
 		return NULL;
 	}
@@ -126,17 +124,17 @@ java_lang_Class *_Jv_java_lang_ClassLoader_defineClass(java_lang_ClassLoader *cl
 	/* check if the JVMTI wants to modify the class */
 
 	if (new_class_data == NULL)
-		c = class_define(utfname, loader, new_class_data_len, new_class_data); 
+		c = class_define(utfname, loader, new_class_data_len, new_class_data, pd);
 	else
 #endif
-		c = class_define(utfname, loader, len, (const uint8_t *) &data->data[offset]);
+		c = class_define(utfname, loader, len, (const uint8_t *) &data->data[offset], pd);
 
 	if (c == NULL)
 		return NULL;
 
 	/* for convenience */
 
-	o = (java_lang_Class *) c;
+	o = LLNI_classinfo_wrap(c);
 
 #if defined(WITH_CLASSPATH_GNU)
 	/* set ProtectionDomain */