next try to fix deadlock in plasmaWordIndex

see also: http://www.yacy-forum.de/viewtopic.php?p=34821#34821 git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3607 6c8d7289-2bf4-0310-a012-ef5d649a1542
yacy · Apr 27, 2007 · 62c947b · 62c947b
1 parent 871ee1c
commit 62c947b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/source/de/anomic/plasma/plasmaWordIndex.java b/source/de/anomic/plasma/plasmaWordIndex.java
@@ -173,10 +173,10 @@ public void addEntry(String wordHash, indexRWIEntry entry, long updateTime, bool
         if ((!dhtInCase) && (yacyDHTAction.shallBeOwnWord(wordHash))) dhtInCase = true;
 
         // add the entry
-        if (dhtInCase) synchronized (dhtInCache) {
+        if (dhtInCase) {
             dhtInCache.addEntry(wordHash, entry, updateTime, true);
             dhtInFlushControl();
-        } else synchronized (dhtOutCache) {
+        } else {
             dhtOutCache.addEntry(wordHash, entry, updateTime, false);
             dhtOutFlushControl();
         }
@@ -189,10 +189,10 @@ public void addEntries(indexContainer entries, long updateTime, boolean dhtInCas
         if ((!dhtInCase) && (yacyDHTAction.shallBeOwnWord(entries.getWordHash()))) dhtInCase = true;
 
         // add the entry
-        if (dhtInCase) synchronized (dhtInCache) {
+        if (dhtInCase) {
             dhtInCache.addEntries(entries, updateTime, true);
             dhtInFlushControl();
-        } else synchronized (dhtOutCache) {
+        } else {
             dhtOutCache.addEntries(entries, updateTime, false);
             dhtOutFlushControl();
         }
@@ -352,7 +352,7 @@ public indexContainer getContainer(String wordHash, Set urlselection, long maxTi
         return container;
     }
 
-    public synchronized Map getContainers(Set wordHashes, Set urlselection, boolean deleteIfEmpty, boolean interruptIfEmpty, long maxTime) {
+    public Map getContainers(Set wordHashes, Set urlselection, boolean deleteIfEmpty, boolean interruptIfEmpty, long maxTime) {
         // return map of wordhash:indexContainer
 
         // retrieve entities that belong to the hashes