[freenet-cvs] r11763 - trunk/freenet/src/freenet/node/fcp

[bb...@freenetproject.org]

Author: bback
Date: 2007-02-12 07:53:12 +0000 (Mon, 12 Feb 2007)
New Revision: 11763

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientRequest.java
   trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java
Log:
changes to fit convention

Modified: trunk/freenet/src/freenet/node/fcp/ClientRequest.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2007-02-11 
23:20:49 UTC (rev 11762)
+++ trunk/freenet/src/freenet/node/fcp/ClientRequest.java       2007-02-12 
07:53:12 UTC (rev 11763)
@@ -304,11 +304,9 @@
     protected abstract FCPMessage persistentTagMessage();

     /**
-     * Called after a ModifyPersistentRequest. Send a PersistentTagMessage to 
the clients.
+     * Called after a ModifyPersistentRequest.
+     * Sends a PersistentRequestModified message to clients if any value 
changed. 
      */
-    /**
-     * Called after a ModifyPersistentRequest. 
-     */
     public void requestWasModified(String newClientToken, short 
newPriorityClass) {

         boolean clientTokenChanged = false;
@@ -333,8 +331,9 @@

         if( clientTokenChanged || priorityClassChanged ) {
             if(persistenceType != ClientRequest.PERSIST_CONNECTION) {
-                if(client != null)
+                if(client != null) {
                     client.server.forceStorePersistentRequests();
+                }
             }
         } else {
             return; // quick return, nothing was changed

Modified: 
trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java    
2007-02-11 23:20:49 UTC (rev 11762)
+++ trunk/freenet/src/freenet/node/fcp/PersistentRequestModifiedMessage.java    
2007-02-12 07:53:12 UTC (rev 11763)
@@ -13,36 +13,31 @@

     private final String ident;
     private final boolean global;
-
-    private final SimpleFieldSet fs;

-    private PersistentRequestModifiedMessage(String identifier, boolean 
global) {
-        // remembered for the MessageInvalidException only
-        this.ident = identifier;
-        this.global = global;
-
-        fs = new SimpleFieldSet(true);
-        fs.putSingle("Identifier", identifier);
-        if(global) fs.putSingle("Global", "true");
-    }
-
+    private final short priorityClass;
+    private final String clientToken;
+    
     public PersistentRequestModifiedMessage(String identifier, boolean global, 
short priorityClass) {
-        this(identifier, global);
-        fs.putSingle("PriorityClass", Short.toString(priorityClass));
+        this(identifier, global, priorityClass, null); // clientToken not set
     }

     public PersistentRequestModifiedMessage(String identifier, boolean global, 
String clientToken) {
-        this(identifier, global);
-        fs.putSingle("ClientToken", clientToken);
+        this(identifier, global, (short)(-1), clientToken); // priorityClass 
not set
     }

     public PersistentRequestModifiedMessage(String identifier, boolean global, 
short priorityClass, String clientToken) {
-        this(identifier, global);
-        fs.putSingle("PriorityClass", Short.toString(priorityClass));
-        fs.putSingle("ClientToken", clientToken);
+        this.ident = identifier;
+        this.global = global;
+        this.priorityClass = priorityClass;
+        this.clientToken = clientToken;
     }

     public SimpleFieldSet getFieldSet() {
+        final SimpleFieldSet fs = new SimpleFieldSet(true);
+        fs.putSingle("Identifier", ident);
+        if(global) fs.putSingle("Global", "true");
+        if(priorityClass >= 0)   fs.putSingle("PriorityClass", 
Short.toString(priorityClass));
+        if(clientToken != null ) fs.putSingle("ClientToken", clientToken);
         return fs;
     }