made Objs based upon ArrayIdentityMap, allowed out-of-transaction reads of current vals

1 files changed, 5 insertions, 2 deletions

diff --git a/src/cli/runtime/Transaction.cs b/src/cli/runtime/Transaction.cs
index 21ff35bc..aaaac9dc 100644
--- a/src/cli/runtime/Transaction.cs
+++ b/src/cli/runtime/Transaction.cs
@@ -71,8 +71,11 @@ static public TRef tref(Object val) {
 }

 

 static public Object get2(TRef tref) {

-	 return ThreadLocalData.getTransaction().get(tref);

-}

+    Transaction trans = ThreadLocalData.getTransaction();

+    if(trans != null)

+        return trans.get(tref);

+    return getCurrent(tref).val;

+    }

 

 static public Object set2(TRef tref, Object val) {

 	 return ThreadLocalData.getTransaction().set(tref,val);