Author: toad
Date: 2009-01-16 15:17:20 +0000 (Fri, 16 Jan 2009)
New Revision: 25086

Modified:
   trunk/freenet/src/freenet/node/NodeClientCore.java
Log:
Don't re-check status


Modified: trunk/freenet/src/freenet/node/NodeClientCore.java
===================================================================
--- trunk/freenet/src/freenet/node/NodeClientCore.java  2009-01-16 14:36:12 UTC 
(rev 25085)
+++ trunk/freenet/src/freenet/node/NodeClientCore.java  2009-01-16 15:17:20 UTC 
(rev 25086)
@@ -682,7 +682,7 @@
                                                }
                                        }
 
-                               if(rs.getStatus() == RequestSender.SUCCESS)
+                               if(status == RequestSender.SUCCESS)
                                        try {
                                                return new 
ClientCHKBlock(rs.getPRB().getBlock(), rs.getHeaders(), key, true);
                                        } catch(CHKVerifyException e) {
@@ -693,8 +693,7 @@
                                                throw new 
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR);
                                        }
                                else {
-                                       int rStatus = rs.getStatus();
-                                       switch(rStatus) {
+                                       switch(status) {
                                                case RequestSender.NOT_FINISHED:
                                                        Logger.error(this, "RS 
still running in getCHK!: " + rs);
                                                        throw new 
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR);
@@ -716,7 +715,7 @@
                                                case 
RequestSender.INTERNAL_ERROR:
                                                        throw new 
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR);
                                                default:
-                                                       Logger.error(this, 
"Unknown RequestSender code in getCHK: " + rStatus + " on " + rs);
+                                                       Logger.error(this, 
"Unknown RequestSender code in getCHK: " + status + " on " + rs);
                                                        throw new 
LowLevelGetException(LowLevelGetException.INTERNAL_ERROR);
                                        }
                                }

_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs

Reply via email to