move hashCode method to native method

diff --git a/Robust/src/ClassLibrary/Bristlecone/Object.java b/Robust/src/ClassLibrary/Bristlecone/Object.java
index f2d05d25513c783e7fc90095102e614a8d742267..304aa4304a3cd4f8cd9e1140d49e0d70fb71b0d8 100644 (file)
--- a/Robust/src/ClassLibrary/Bristlecone/Object.java
+++ b/Robust/src/ClassLibrary/Bristlecone/Object.java
@@ -1,18 +1,11 @@
 public class Object {
-  public native int nativehashCode();
   private int cachedCode;  //first field has to be a primitive
   private boolean cachedHash;
 
   /* DO NOT USE ANY OF THESE - THEY ARE FOR IMPLEMENTING TAGS */
   private Object tags;
 
-  public int hashCode() {
-    if (!cachedHash) {
-      cachedCode=nativehashCode();
-      cachedHash=true;
-    }
-    return cachedCode;
-  }
+  public native int hashCode();
 
   /* DON'T USE THIS METHOD UNLESS NECESSARY */
   /* WE WILL DEPRECATE IT AS SOON AS INSTANCEOF WORKS */

diff --git a/Robust/src/ClassLibrary/FastCheck/Object.java b/Robust/src/ClassLibrary/FastCheck/Object.java
index 351f032d3d4f1744874148989afe1f56f5d4b50b..3a867bb67b5116fa60f578e13f464cdcdd19d3de 100644 (file)
--- a/Robust/src/ClassLibrary/FastCheck/Object.java
+++ b/Robust/src/ClassLibrary/FastCheck/Object.java
@@ -4,19 +4,11 @@ public class Object {
   public Object nextobject;   /* Oid */
   public Object localcopy;
 
-  public native int nativehashCode();
-
   /* DO NOT USE ANY OF THESE - THEY ARE FOR IMPLEMENTING TAGS */
   private Object tags;
 
 
-  public int hashCode() {
-    if (!cachedHash) {
-      cachedCode=nativehashCode();
-      cachedHash=true;
-    }
-    return cachedCode;
-  }
+  public native int hashCode();
 
   /* DON'T USE THIS METHOD UNLESS NECESSARY */
   /* WE WILL DEPRECATE IT AS SOON AS INSTANCEOF WORKS */

diff --git a/Robust/src/ClassLibrary/Java/Object.java b/Robust/src/ClassLibrary/Java/Object.java
index 4968cfa3233b24e69e253dba3cf53f1ed70ede88..b250cc86955cf04b96eda0e9be38416b637b50e0 100644 (file)
--- a/Robust/src/ClassLibrary/Java/Object.java
+++ b/Robust/src/ClassLibrary/Java/Object.java
@@ -2,15 +2,7 @@ public class Object {
   public int cachedCode;   //first field has to be a primitive
   public boolean cachedHash;
 
-  public native int nativehashCode();
-
-  public int hashCode() {
-    if (!cachedHash) {
-      cachedCode=nativehashCode();
-      cachedHash=true;
-    }
-    return cachedCode;
-  }
+  public native int hashCode();
 
   /* DON'T USE THIS METHOD UNLESS NECESSARY */
   /* WE WILL DEPRECATE IT AS SOON AS INSTANCEOF WORKS */

diff --git a/Robust/src/ClassLibrary/JavaThread/Object.java b/Robust/src/ClassLibrary/JavaThread/Object.java
index a3bc22d94ab17ff51636f5528e55cf8c3039a7ef..53173230780d0e611925a5db823436b303a5acbb 100644 (file)
--- a/Robust/src/ClassLibrary/JavaThread/Object.java
+++ b/Robust/src/ClassLibrary/JavaThread/Object.java
@@ -2,20 +2,13 @@ public class Object {
   public int cachedCode;   //first field has to be a primitive
   public boolean cachedHash;
 
-  public native int nativehashCode();
   private Object nextlockobject;
   private Object prevlockobject;
 
   // temporary extra unused int filed to align objects for Java
   int wkhqwemnbmwnb;
 
-  public int hashCode() {
-    if (!cachedHash) {
-      cachedCode=nativehashCode();
-      cachedHash=true;
-    }
-    return cachedCode;
-  }
+  public native int hashCode();
 
   /* DON'T USE THIS METHOD UNLESS NECESSARY */
   /* WE WILL DEPRECATE IT AS SOON AS INSTANCEOF WORKS */

diff --git a/Robust/src/ClassLibrary/MGC/Object.java b/Robust/src/ClassLibrary/MGC/Object.java
index e94c34dc3b3244357f128163455cb66290835ca4..b7e6f03f297f84adf515fbb202ff93c5d1028ef1 100644 (file)
--- a/Robust/src/ClassLibrary/MGC/Object.java
+++ b/Robust/src/ClassLibrary/MGC/Object.java
@@ -2,20 +2,13 @@ public class Object {
   public int cachedCode;   //first field has to be a primitive
   public boolean cachedHash;
 
-  public native int nativehashCode();
   private Object nextlockobject;
   private Object prevlockobject;
 
   // temporary extra unused int filed to align objects for Java
   //int wkhqwemnbmwnb;
 
-  public int hashCode() {
-    if (!cachedHash) {
-      cachedCode=nativehashCode();
-      cachedHash=true;
-    }
-    return cachedCode;
-  }
+  public native int hashCode();
 
   /* DON'T USE THIS METHOD UNLESS NECESSARY */
   /* WE WILL DEPRECATE IT AS SOON AS INSTANCEOF WORKS */