[freenet-cvs] r8142 - in trunk/freenet/src/freenet/node: . fcp

[t...@freenetproject.org]

Author: toad
Date: 2006-03-03 14:24:00 +0000 (Fri, 03 Mar 2006)
New Revision: 8142

Modified:
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
   trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
Log:
481:
Persistence fixes.

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-02 22:48:36 UTC (rev 
8141)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-03 14:24:00 UTC (rev 
8142)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java   2006-03-02 22:48:36 UTC 
(rev 8141)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java   2006-03-03 14:24:00 UTC 
(rev 8142)
@@ -133,6 +133,7 @@
                fctx.maxNonSplitfileRetries = maxRetries;
                fctx.maxSplitfileBlockRetries = maxRetries;
                getter = new ClientGetter(this, client.node.fetchScheduler, 
uri, fctx, priorityClass, client);
+               start();
        }

        void start() {

Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java    2006-03-02 
22:48:36 UTC (rev 8141)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java    2006-03-03 
14:24:00 UTC (rev 8142)
@@ -101,7 +101,7 @@
                        if(tempFilename == null)
                                tempFilename = filename + ".freenet-tmp";
                        tempFile = new File(tempFilename);
-                       
if(!diskFile.getParentFile().equals(tempFile.getParentFile()))
+                       
if(!diskFile.getAbsoluteFile().getParentFile().equals(tempFile.getAbsoluteFile().getParentFile()))
                                throw new 
MessageInvalidException(ProtocolErrorMessage.FILENAME_AND_TEMP_FILENAME_MUST_BE_IN_SAME_DIR,
 null, identifier);
                        if(diskFile.exists())
                                throw new 
MessageInvalidException(ProtocolErrorMessage.DISK_TARGET_EXISTS, null, 
identifier);