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

[t...@freenetproject.org]

Author: toad
Date: 2008-06-26 16:17:38 +0000 (Thu, 26 Jun 2008)
New Revision: 20752

Modified:
   trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
   trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java
Log:
Add Global=true/false to URIGenerated

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutBase.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutBase.java       2008-06-26 
15:47:58 UTC (rev 20751)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutBase.java       2008-06-26 
16:17:38 UTC (rev 20752)
@@ -247,7 +247,7 @@
        private void trySendGeneratedURIMessage(FCPConnectionOutputHandler 
handler) {
                FCPMessage msg;
                synchronized(this) {
-                       msg = new URIGeneratedMessage(generatedURI, identifier);
+                       msg = new URIGeneratedMessage(generatedURI, identifier, 
client.isGlobalQueue);
                }
                if(handler != null)
                        handler.queue(msg);

Modified: trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java 2008-06-26 
15:47:58 UTC (rev 20751)
+++ trunk/freenet/src/freenet/node/fcp/URIGeneratedMessage.java 2008-06-26 
16:17:38 UTC (rev 20752)
@@ -11,16 +11,19 @@

        private final FreenetURI uri;
        private final String identifier;
+       private final boolean global;

-       public URIGeneratedMessage(FreenetURI uri, String identifier) {
+       public URIGeneratedMessage(FreenetURI uri, String identifier, boolean 
global) {
                this.uri = uri;
                this.identifier = identifier;
+               this.global = global;
        }

        public SimpleFieldSet getFieldSet() {
                SimpleFieldSet fs = new SimpleFieldSet(true);
                fs.putSingle("URI", uri.toString());
                fs.putSingle("Identifier", identifier);
+               fs.put("Global", global);
                return fs;
        }