[Thaw-dev] r11246 - in trunk/apps/Thaw/src/thaw/plugins: . index

[c...@freenetproject.org]

Author: jflesch
Date: 2006-12-05 19:56:19 +0000 (Tue, 05 Dec 2006)
New Revision: 11246

Modified:
   trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java
   trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Remove lock on database writing to avoid deadlock

Modified: trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java        2006-12-05 19:50:43 UTC 
(rev 11245)
+++ trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java        2006-12-05 19:56:19 UTC 
(rev 11246)
@@ -36,18 +36,20 @@


        public synchronized void lockWriting() {
+               /*
                while(writeLock > 0) {
                        try {
                                Thread.sleep(100);
                        } catch(java.lang.InterruptedException e) {
-                               /* \_o< */
+
                        }
                }
                writeLock++;
+               */
        }

        public synchronized void unlockWriting() {
-               writeLock = 0;
+               //writeLock = 0;
        }

        public void realStart() {

Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2006-12-05 19:50:43 UTC (rev 11245)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java   
2006-12-05 19:56:19 UTC (rev 11246)
@@ -411,6 +411,7 @@
                        parent = tree.getRoot();

                Index index = new Index(db, queueManager, uIndexList, -2, 
parent, name, name, publicKey, privateKey, 0, null);
+               uIndexList.removeLink(index);

                index.create();

@@ -419,8 +420,6 @@
                parent.insert(index.getTreeNode(), 0);

                tree.reloadModel(parent);
-
-               uIndexList.removeLink(index);
        }