[Thaw-dev] r12741 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-14 23:29:05 +0000 (Sat, 14 Apr 2007)
New Revision: 12741

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
Log:
Fix NPE in ClientPut when restarting an insertion

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-14 23:15:22 UTC 
(rev 12740)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientPut.java      2007-04-14 23:29:05 UTC 
(rev 12741)
@@ -203,11 +203,11 @@

                sha = null;

-               if 
(queueManager.getQueryManager().getConnection().isLocalSocket()) {
+               if 
(queueManager.getQueryManager().getConnection().isLocalSocket() && localFile != 
null) {
                        status = "Computing hash to get approval from the node 
...";

                        sha = new 
SHA256Computer(queueManager.getQueryManager().getConnection().getClientHello().getConnectionId()
-                                                +"-"+ (localFile != null ? 
localFile.getPath() : "") /* Client token */
+                                                +"-"+ localFile.getPath() /* 
Client token */
                                                 +"-",
                                                 localFile.getPath());
                        sha.addObserver(this);