From 223d1112ab8c8b0ef457588d4861f0ad8a2d5c05 Mon Sep 17 00:00:00 2001
From: bdemsky <bdemsky>
Date: Fri, 1 Apr 2011 02:03:53 +0000
Subject: [PATCH] move hashCode method to native method

---
 Robust/src/ClassLibrary/Bristlecone/Object.java |  9 +--------
 Robust/src/ClassLibrary/FastCheck/Object.java   | 10 +---------
 Robust/src/ClassLibrary/Java/Object.java        | 10 +---------
 Robust/src/ClassLibrary/JavaThread/Object.java  |  9 +--------
 Robust/src/ClassLibrary/MGC/Object.java         |  9 +--------
 5 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/Robust/src/ClassLibrary/Bristlecone/Object.java b/Robust/src/ClassLibrary/Bristlecone/Object.java
index f2d05d25..304aa430 100644
--- 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 351f032d..3a867bb6 100644
--- 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 4968cfa3..b250cc86 100644
--- 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 a3bc22d9..53173230 100644
--- 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 e94c34dc..b7e6f03f 100644
--- 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 */
-- 
2.34.1