From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Mon, 27 Aug 2018 14:02:41 +0000 (+0000)
Subject: Merge "Disabled BOOKKEEPING flag for normal use"
X-Git-Tag: v1.43.0~136^2~402
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=059e997dd3e02030c3981f1a35e1d2848965109f;hp=48135dcd03588783f9c1b688aaa53cdaacba6ef2

Merge "Disabled BOOKKEEPING flag for normal use"
---

diff --git a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java
index 232e5cbd7..af0604ae6 100644
--- a/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java
+++ b/bundles/org.simantics.db.impl/src/org/simantics/db/impl/graph/AsyncBarrierImpl.java
@@ -26,14 +26,14 @@ final public class AsyncBarrierImpl extends AtomicInteger implements AsyncBarrie
 
 	private static final long serialVersionUID = 4724463372850048672L;
 
-	static final HashMap<AsyncBarrierImpl, Collection<AsyncBarrierImpl>> reverseLookup = new HashMap<AsyncBarrierImpl, Collection<AsyncBarrierImpl>>();
-	public static final HashMap<AsyncBarrierImpl, Debugger> debuggerMap = new HashMap<AsyncBarrierImpl, Debugger>();
-	static final HashMap<AsyncBarrierImpl, CacheEntry> entryMap = new HashMap<AsyncBarrierImpl, CacheEntry>();
-	static final HashMap<AsyncBarrierImpl, Boolean> restartMap = new HashMap<AsyncBarrierImpl, Boolean>();
+	static final HashMap<AsyncBarrierImpl, Collection<AsyncBarrierImpl>> reverseLookup = new HashMap<>();
+	public static final HashMap<AsyncBarrierImpl, Debugger> debuggerMap = new HashMap<>();
+	static final HashMap<AsyncBarrierImpl, CacheEntry<?>> entryMap = new HashMap<>();
+	static final HashMap<AsyncBarrierImpl, Boolean> restartMap = new HashMap<>();
 
 	static final int WAIT_TIME = 600;
 
-	public static final boolean BOOKKEEPING = true;
+	public static final boolean BOOKKEEPING = false;
 	public static final boolean PRINT = false;
 	static final boolean RESTART_GUARD = true;
 
@@ -41,7 +41,7 @@ final public class AsyncBarrierImpl extends AtomicInteger implements AsyncBarrie
 
 	//private final Semaphore sema = new Semaphore(0);
 
-	public AsyncBarrierImpl(AsyncBarrierImpl caller, CacheEntry entry) {
+	public AsyncBarrierImpl(AsyncBarrierImpl caller, CacheEntry<?> entry) {
 		super(0);
 		if (BOOKKEEPING) {
 			synchronized (entryMap) {
@@ -208,7 +208,7 @@ final public class AsyncBarrierImpl extends AtomicInteger implements AsyncBarrie
 	}
 
 	public static String report(AsyncBarrierImpl barrier) {
-		CacheEntry e = entryMap.get(barrier);
+		CacheEntry<?> e = entryMap.get(barrier);
 		if(e != null) return e.toString();
 		else return "Barrier@" + System.identityHashCode(barrier);
 	}