Author: jflesch
Date: 2006-12-05 23:33:51 +0000 (Tue, 05 Dec 2006)
New Revision: 11254
Modified:
trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java
trunk/apps/Thaw/src/thaw/plugins/index/Index.java
trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
Log:
Fix key changing dialog (+2 NPE)
Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-12-05 23:24:03 UTC
(rev 11253)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java 2006-12-05 23:33:51 UTC
(rev 11254)
@@ -408,7 +408,8 @@
Logger.info(this, "File received");
-
duplicatedQueryManager.getConnection().removeFromWriterQueue();
+ if (duplicatedQueryManager != null)
+
duplicatedQueryManager.getConnection().removeFromWriterQueue();
this.isLockOwner= false;
Modified: trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java 2006-12-05 23:24:03 UTC
(rev 11253)
+++ trunk/apps/Thaw/src/thaw/plugins/Hsqldb.java 2006-12-05 23:33:51 UTC
(rev 11254)
@@ -36,20 +36,11 @@
public synchronized void lockWriting() {
- /*
- while(writeLock > 0) {
- try {
- Thread.sleep(100);
- } catch(java.lang.InterruptedException e) {
- }
- }
- writeLock++;
- */
}
public synchronized void unlockWriting() {
- //writeLock = 0;
+
}
public void realStart() {
Modified: trunk/apps/Thaw/src/thaw/plugins/index/Index.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-12-05 23:24:03 UTC
(rev 11253)
+++ trunk/apps/Thaw/src/thaw/plugins/index/Index.java 2006-12-05 23:33:51 UTC
(rev 11254)
@@ -718,7 +718,10 @@
public Vector getFileList() {
Vector newList = new Vector();
- for(Iterator it = this.fileList.iterator();
+ if (fileList == null)
+ return newList;
+
+ for(Iterator it = fileList.iterator();
it.hasNext();) {
newList.add(it.next());
}
@@ -914,7 +917,10 @@
{
Vector newList = new Vector();
- for(Iterator it = this.linkList.iterator();
+ if (linkList == null)
+ return;
+
+ for(Iterator it = linkList.iterator();
it.hasNext();) {
newList.add(it.next());
}
Modified: trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2006-12-05 23:24:03 UTC (rev 11253)
+++ trunk/apps/Thaw/src/thaw/plugins/index/IndexManagementHelper.java
2006-12-05 23:33:51 UTC (rev 11254)
@@ -184,7 +184,7 @@
return ((new KeyAsker()).askKeysBis(askPrivateKey,
defaultPublicKey, defaultPrivateKey, mainWindow));
}
- public String[] askKeysBis(boolean askPrivateKey,
+ public synchronized String[] askKeysBis(boolean askPrivateKey,
String defaultPublicKey,
String defaultPrivateKey,
MainWindow mainWindow) {
@@ -250,14 +250,19 @@
/* TODO: DO IT BETTER YOU ?^{"(*? */
/* VVVVVVVVVVV */
-
+ try {
+ wait();
+ } catch(java.lang.InterruptedException e) {
+ /* \_o< */
+ }
+ /*
while(formState == 0) {
try {
Thread.sleep(500);
} catch(InterruptedException e) {
- /* \_o< */
+
}
- }
+ }*/
frame.setVisible(false);
@@ -272,16 +277,19 @@
else
keys[1] = null;
+ frame.dispose();
+
if (keys[0] == null || keys[0].length() < 20)
return null;
if (keys[1] == null || keys[1].length() < 20)
keys[1] = null;
+
return keys;
}
- public void actionPerformed(ActionEvent e) {
+ public synchronized void actionPerformed(ActionEvent e) {
if (e.getSource() == okButton) {
formState = 1;
}
@@ -289,6 +297,8 @@
if (e.getSource() == cancelButton) {
formState = 2;
}
+
+ notify();
}
public void mouseClicked(MouseEvent e) { }
