[freenet-cvs] r9757 - in trunk/freenet/src/freenet: client/async node node/fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-07-25 17:50:05 +0000 (Tue, 25 Jul 2006)
New Revision: 9757

Modified:
   trunk/freenet/src/freenet/client/async/SingleFileInserter.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
898: More lock fixes, include DataLength in PersistentPut even if the request 
has finished.

Modified: trunk/freenet/src/freenet/client/async/SingleFileInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileInserter.java      
2006-07-25 17:39:58 UTC (rev 9756)
+++ trunk/freenet/src/freenet/client/async/SingleFileInserter.java      
2006-07-25 17:50:05 UTC (rev 9757)
@@ -484,7 +484,7 @@
                        return token;
                }

-               public synchronized SimpleFieldSet getProgressFieldset() {
+               public SimpleFieldSet getProgressFieldset() {
                        ClientPutState curSFI;
                        ClientPutState curMetadataPutter;
                        synchronized(this) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-07-25 17:39:58 UTC (rev 
9756)
+++ trunk/freenet/src/freenet/node/Version.java 2006-07-25 17:50:05 UTC (rev 
9757)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 897;
+       private static final int buildNumber = 898;

        /** Oldest build of Fred we will talk to */
        private static final int oldLastGoodBuild = 870;

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-07-25 17:39:58 UTC 
(rev 9756)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java   2006-07-25 17:50:05 UTC 
(rev 9757)
@@ -173,8 +173,9 @@
                data.free();
        }

-       public synchronized SimpleFieldSet getFieldSet() {
+       public SimpleFieldSet getFieldSet() {
                SimpleFieldSet fs = super.getFieldSet();
+               // This is all fixed, so no need for synchronization.
                fs.put("Metadata.ContentType", clientMetadata.getMIMEType());
                fs.put("UploadFrom", 
ClientPutMessage.uploadFromString(uploadFrom));
                if(uploadFrom == ClientPutMessage.UPLOAD_FROM_DISK) {
@@ -202,7 +203,7 @@
        protected FCPMessage persistentTagMessage() {
                return new PersistentPut(identifier, uri, verbosity, 
priorityClass, uploadFrom, targetURI, 
                                persistenceType, origFilename, 
clientMetadata.getMIMEType(), client.isGlobalQueue,
-                               data == null ? -1 : data.size(), clientToken, 
started);
+                               getDataSize(), clientToken, started);
        }

        protected String getTypeName() {

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-07-25 17:39:58 UTC 
(rev 9756)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-07-25 17:50:05 UTC 
(rev 9757)
@@ -474,7 +474,7 @@
        }

        /** Store all persistent requests to disk */
-       public void storePersistentRequests() {
+       private void storePersistentRequests() {
                Logger.minor(this, "Storing persistent requests");
                ClientRequest[] persistentRequests = getPersistentRequests();
                Logger.minor(this, "Persistent requests count: 
"+persistentRequests.length);