src/native/jvmti/jvmti.c (GetClassStatus): bugfix - only compare class state

diff --git a/src/native/jvmti/jvmti.c b/src/native/jvmti/jvmti.c
index 76c124aa69c6191f43ab995bf40dc3e5b8f0ebbd..0aac6f9b2000354cf362e00d09b0be8646e5f452 100644 (file)
--- a/src/native/jvmti/jvmti.c
+++ b/src/native/jvmti/jvmti.c
@@ -31,7 +31,7 @@
             Samuel Vinson
 
    
-   $Id: jvmti.c 4954 2006-05-25 21:59:49Z motse $
+   $Id: jvmti.c 4963 2006-05-26 12:31:23Z motse $
 
 */
 
@@ -1793,13 +1793,13 @@ GetClassStatus (jvmtiEnv * env, jclass klass, jint * status_ptr)
        *status_ptr = 0;        
 
 /*     if (c) *status_ptr = *status_ptr | JVMTI_CLASS_STATUS_VERIFIED; ? */
-       if (c->state&=CLASS_LINKED) 
+       if (c->state & CLASS_LINKED) 
                *status_ptr = *status_ptr | JVMTI_CLASS_STATUS_PREPARED;
 
-       if (c->state&=CLASS_INITIALIZED) 
+       if (c->state & CLASS_INITIALIZED) 
                *status_ptr = *status_ptr | JVMTI_CLASS_STATUS_INITIALIZED;
 
-       if (c->state&=CLASS_ERROR) 
+       if (c->state & CLASS_ERROR) 
                *status_ptr = *status_ptr | JVMTI_CLASS_STATUS_ERROR;
 
        if (c->vftbl->arraydesc != NULL) 
@@ -2367,9 +2367,9 @@ GetLineNumberTable (jvmtiEnv * env, jmethodID method,
 
 
     for (i=0; i < *entry_count_ptr; i++) {
-        (*table_ptr[i]).start_location = 
+        (*table_ptr)[i].start_location = 
             (jlocation) ((methodinfo*)method)->linenumbers[i].start_pc;
-        (*table_ptr[i]).line_number = 
+        (*table_ptr)[i].line_number = 
             (jint) ((methodinfo*)method)->linenumbers[i].line_number;
     }
     

diff --git a/src/native/vm/VMMethod.c b/src/native/vm/VMMethod.c
index 3d490037c7684baa3311c4fcc3c89e01b36c201c..76eae22b91ff940e01fef0d1131ced35dd604518 100644 (file)
--- a/src/native/vm/VMMethod.c
+++ b/src/native/vm/VMMethod.c
@@ -25,6 +25,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 Contact: cacao@cacaojvm.org
 
 Authors: Samuel Vinson
+         Martin Platter
+         
 
 Changes: