From 6650a58ecb1ea8d009c8b3b57c4dec5307de90b3 Mon Sep 17 00:00:00 2001
From: Ian Farmer <ian.farmer@luaj.org>
Date: Sat, 18 Oct 2008 01:23:45 +0000
Subject: [PATCH] Add test case for weak table rehashing, and fix bug that was
 found.

---
 src/core/org/luaj/vm/LWeakTable.java          |  2 +-
 src/test/java/org/luaj/vm/LWeakTableTest.java | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/core/org/luaj/vm/LWeakTable.java b/src/core/org/luaj/vm/LWeakTable.java
index 71da6dbc..fccd6a84 100644
--- a/src/core/org/luaj/vm/LWeakTable.java
+++ b/src/core/org/luaj/vm/LWeakTable.java
@@ -50,7 +50,7 @@ public class LWeakTable extends LTable {
 	protected LValue normalizeGet(Object val) {
 		if ( val instanceof WeakReference )
 			val = ((WeakReference)val).get();
-		else if ( val != null ) {
+		else if ( val instanceof LUserData ) {
 			LUserData ud = (LUserData) val;
 			Object o = ((WeakReference) ud.m_instance).get();
 			if ( o != null )
diff --git a/src/test/java/org/luaj/vm/LWeakTableTest.java b/src/test/java/org/luaj/vm/LWeakTableTest.java
index a7d9da49..8faa9d79 100644
--- a/src/test/java/org/luaj/vm/LWeakTableTest.java
+++ b/src/test/java/org/luaj/vm/LWeakTableTest.java
@@ -69,4 +69,40 @@ public class LWeakTableTest extends LTableTest {
 		runTest(100,0,2000,200);
 	}
 	
+	public void testWeakTableRehashToEmpty() {
+		LTable t = new_LTable();
+		
+		Object obj = new Object();
+		LTable tableValue = new LTable();
+		LString stringValue = LString.valueOf("this is a test");
+		
+		t.put("table", tableValue);
+		t.put("userdata", new LUserData(obj, null));
+		t.put("string", stringValue);
+		t.put("string2", LString.valueOf("another string"));
+		assertTrue("table must have at least 4 elements", t.hashKeys.length > 4);
+		
+		System.gc();
+		
+		assertTrue("table must have at least 4 elements", t.hashKeys.length > 4);
+		assertEquals(tableValue, t.get(LString.valueOf("table")));
+		assertEquals(stringValue, t.get(LString.valueOf("string")));
+		assertEquals(obj, t.get(LString.valueOf("userdata")).toJavaInstance());
+		
+		obj = null;
+		tableValue = null;
+		stringValue = null;
+		
+		// Garbage collection should cause weak entries to be dropped.
+		System.gc();
+		
+		// Add a new key to cause a rehash - note that this causes the test to
+		// be dependent on the load factor, which is an implementation detail.
+		t.put("newkey1", 1);
+		
+		// Removing the new key should leave the table empty since first set of values fell out
+		t.put("newkey1", LNil.NIL);
+		
+		assertTrue("weak table must be empty", t.hashKeys.length == 0);
+	}
 }