[freenet-cvs] r11767 - in trunk/freenet/src/freenet: clients/http node/fcp

[bb...@freenetproject.org]

Author: bback
Date: 2007-02-13 17:40:54 +0000 (Tue, 13 Feb 2007)
New Revision: 11767

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
   trunk/freenet/src/freenet/node/fcp/FCPClient.java
Log:
changes on persistent items via http client now sends notify messages

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2007-02-13 
16:35:29 UTC (rev 11766)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2007-02-13 
17:40:54 UTC (rev 11767)
@@ -171,7 +171,7 @@
 loop:                          for (int requestIndex = 0, requestCount = 
clientRequests.length; requestIndex < requestCount; requestIndex++) {
                                        ClientRequest clientRequest = 
clientRequests[requestIndex];
                                        if 
(clientRequest.getIdentifier().equals(identifier)) {
-                                               
clientRequest.setPriorityClass(newPriority);
+                                               
clientRequest.modifyRequest(null, newPriority); // no new ClientToken
                                                break loop;
                                        }
                                }

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2007-02-13 
16:35:29 UTC (rev 11766)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2007-02-13 
17:40:54 UTC (rev 11767)
@@ -211,15 +211,6 @@
                return identifier;
        }

-       public void setPriorityClass(short priorityClass) {
-               this.priorityClass = priorityClass;
-               getClientRequest().setPriorityClass(priorityClass);
-       }
-
-       public void setClientToken(String clientToken) {
-               this.clientToken = clientToken;
-       }
-
        protected abstract ClientRequester getClientRequest();

        /** Completed request dropped off the end without being acknowledged */
@@ -315,17 +306,18 @@
         if(newClientToken != null) {
             if( clientToken != null ) {
                 if( !newClientToken.equals(clientToken) ) {
-                    setClientToken(newClientToken); // token changed
+                    this.clientToken = newClientToken; // token changed
                     clientTokenChanged = true;
                 }
             } else {
-                setClientToken(newClientToken); // first time the token is set
+                this.clientToken = newClientToken; // first time the token is 
set
                 clientTokenChanged = true;
             }
         }

         if(newPriorityClass >= 0 && newPriorityClass != priorityClass) {
-            setPriorityClass(newPriorityClass);
+            this.priorityClass = newPriorityClass;
+            getClientRequest().setPriorityClass(priorityClass);
             priorityClassChanged = true;
         }


Modified: trunk/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPClient.java   2007-02-13 16:35:29 UTC 
(rev 11766)
+++ trunk/freenet/src/freenet/node/fcp/FCPClient.java   2007-02-13 17:40:54 UTC 
(rev 11767)
@@ -171,6 +171,7 @@
                                throw new 
MessageInvalidException(ProtocolErrorMessage.NO_SUCH_IDENTIFIER, "Not found", 
identifier, isGlobalQueue);
                        clientRequestsByIdentifier.remove(identifier);
                }
+        req.requestWasRemoved();
                if(kill) {
                        if(logMINOR) Logger.minor(this, "Killing request "+req);
                        req.cancel();