[freenet-cvs] r7905 - in branches/async-client/src/freenet: client/async node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-01-23 23:28:05 +0000 (Mon, 23 Jan 2006)
New Revision: 7905

Modified:
   branches/async-client/src/freenet/client/async/ClientRequestScheduler.java
   branches/async-client/src/freenet/node/fcp/PutFailedMessage.java
Log:
Include Fatal on PutFailed.

Modified: 
branches/async-client/src/freenet/client/async/ClientRequestScheduler.java
===================================================================
--- branches/async-client/src/freenet/client/async/ClientRequestScheduler.java  
2006-01-23 21:46:27 UTC (rev 7904)
+++ branches/async-client/src/freenet/client/async/ClientRequestScheduler.java  
2006-01-23 23:28:05 UTC (rev 7905)
@@ -7,10 +7,16 @@
  */
 public class ClientRequestScheduler {

-       public void register(SendableRequest req) {
+       
+       
+       public void register(SendableGet req) {
                // FIXME
        }

+       public void register(SendableInsert req) {
+               // FIXME
+       }
+       
        public void remove(SendableRequest sr) {
                // FIXME
        }
@@ -19,4 +25,11 @@
                // FIXME
        }

+       public void startRequest() {
+               // FIXME
+       }
+       
+       public void startInsert() {
+               // FIXME
+       }
 }

Modified: branches/async-client/src/freenet/node/fcp/PutFailedMessage.java
===================================================================
--- branches/async-client/src/freenet/node/fcp/PutFailedMessage.java    
2006-01-23 21:46:27 UTC (rev 7904)
+++ branches/async-client/src/freenet/node/fcp/PutFailedMessage.java    
2006-01-23 23:28:05 UTC (rev 7905)
@@ -14,6 +14,7 @@
        final FailureCodeTracker tracker;
        final FreenetURI expectedURI;
        final String identifier;
+       final boolean isFatal;

        public PutFailedMessage(InserterException e, String identifier) {
                this.code = e.getMode();
@@ -22,6 +23,7 @@
                this.tracker = e.errorCodes;
                this.expectedURI = e.uri;
                this.identifier = identifier;
+               this.isFatal = e.isFatal();
        }

        public SimpleFieldSet getFieldSet() {
@@ -34,6 +36,7 @@
                if(tracker != null) {
                        tracker.copyToFieldSet(fs, "Errors.");
                }
+               fs.put("Fatal", Boolean.toString(isFatal));
                if(expectedURI != null)
                        fs.put("ExpectedURI", expectedURI.toString());
                return fs;