From fb9334bf24147bf4e89cd282f8fd47eb8ae6ab9b Mon Sep 17 00:00:00 2001
From: Arndt Brenschede <Arndt.Brenschede@web.de>
Date: Sun, 16 Dec 2018 13:32:16 +0100
Subject: [PATCH] minor change to workariund a java6 profiling glitch

---
 .../main/java/btools/expressions/BExpressionContext.java    | 6 +++---
 .../src/main/java/btools/expressions/CacheNode.java         | 5 ++---
 .../src/main/java/btools/expressions/VarWrapper.java        | 1 -
 brouter-util/src/main/java/btools/util/LruMap.java          | 2 +-
 brouter-util/src/main/java/btools/util/LruMapNode.java      | 2 ++
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
index 95d2864..2f17781 100644
--- a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
+++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
@@ -322,7 +322,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier
   public final byte[] unify( byte[] ab, int offset, int len )
   {
     probeCacheNode.ab = null; // crc based cache lookup only
-    probeCacheNode.crc = Crc32.crc( ab, offset, len );
+    probeCacheNode.hash = Crc32.crc( ab, offset, len );
 
     CacheNode cn = (CacheNode)cache.get( probeCacheNode );
     if ( cn != null )
@@ -376,7 +376,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier
     else
     {
       probeCacheNode.ab = ab;
-      probeCacheNode.crc = Crc32.crc( ab, 0, ab.length );
+      probeCacheNode.hash = Crc32.crc( ab, 0, ab.length );
       cn = (CacheNode)cache.get( probeCacheNode );
     }
 
@@ -389,7 +389,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier
       {
         cn = new CacheNode();
       }
-      cn.crc = probeCacheNode.crc;
+      cn.hash = probeCacheNode.hash;
       cn.ab = ab;
       cache.put( cn );
 
diff --git a/brouter-expressions/src/main/java/btools/expressions/CacheNode.java b/brouter-expressions/src/main/java/btools/expressions/CacheNode.java
index ff0327a..dd95180 100644
--- a/brouter-expressions/src/main/java/btools/expressions/CacheNode.java
+++ b/brouter-expressions/src/main/java/btools/expressions/CacheNode.java
@@ -6,21 +6,20 @@ import btools.util.LruMapNode;
 
 public final class CacheNode extends LruMapNode
 {
-  int crc;
   byte[] ab;
   float[] vars;
 
   @Override
   public int hashCode()
   {
-    return crc;
+    return hash;
   }
 
   @Override
   public boolean equals( Object o )
   {
     CacheNode n = (CacheNode) o;
-    if ( crc != n.crc )
+    if ( hash != n.hash )
     {
       return false;
     }
diff --git a/brouter-expressions/src/main/java/btools/expressions/VarWrapper.java b/brouter-expressions/src/main/java/btools/expressions/VarWrapper.java
index dc479b0..b7ec5f2 100644
--- a/brouter-expressions/src/main/java/btools/expressions/VarWrapper.java
+++ b/brouter-expressions/src/main/java/btools/expressions/VarWrapper.java
@@ -6,7 +6,6 @@ import btools.util.LruMapNode;
 
 public final class VarWrapper extends LruMapNode
 {
-  int hash;
   float[] vars;
   
   @Override
diff --git a/brouter-util/src/main/java/btools/util/LruMap.java b/brouter-util/src/main/java/btools/util/LruMap.java
index dcf6214..441ecad 100644
--- a/brouter-util/src/main/java/btools/util/LruMap.java
+++ b/brouter-util/src/main/java/btools/util/LruMap.java
@@ -25,7 +25,7 @@ public final class LruMap
   
   public LruMapNode get( LruMapNode key )
   {
-    int bin = ( key.hashCode() & 0xfffffff ) % hashbins;
+    int bin = ( key.hash & 0xfffffff ) % hashbins;
     
     LruMapNode e = binArray[bin];
     while ( e != null )
diff --git a/brouter-util/src/main/java/btools/util/LruMapNode.java b/brouter-util/src/main/java/btools/util/LruMapNode.java
index 6a0c368..31b0af2 100644
--- a/brouter-util/src/main/java/btools/util/LruMapNode.java
+++ b/brouter-util/src/main/java/btools/util/LruMapNode.java
@@ -5,4 +5,6 @@ public abstract class LruMapNode
   LruMapNode nextInBin; // next entry for hash-bin
   LruMapNode next; // next in lru sequence (towards mru)
   LruMapNode previous; // previous in lru sequence (towards lru)
+  
+  public int hash;
 }