diff --git a/batik-gvt/src/main/java/org/apache/batik/gvt/font/AWTGlyphGeometryCache.java b/batik-gvt/src/main/java/org/apache/batik/gvt/font/AWTGlyphGeometryCache.java
index 9df052ac34..1a55bbf9de 100644
--- a/batik-gvt/src/main/java/org/apache/batik/gvt/font/AWTGlyphGeometryCache.java
+++ b/batik-gvt/src/main/java/org/apache/batik/gvt/font/AWTGlyphGeometryCache.java
@@ -150,18 +150,19 @@ public void clear() {
     protected void rehash () {
         Entry[] oldTable = table;
 
-        table = new Entry[oldTable.length * 2 + 1];
+        Entry[] newTable = new Entry[oldTable.length * 2 + 1];
 
         for (int i = oldTable.length-1; i >= 0; i--) {
             for (Entry old = oldTable[i]; old != null;) {
                 Entry e = old;
                 old = old.next;
 
-                int index = e.hash % table.length;
-                e.next = table[index];
-                table[index] = e;
+                int index = e.hash % newTable.length;
+                e.next = newTable[index];
+                newTable[index] = e;
             }
         }
+		table = newTable;
     }
 
     /**