[freenet-cvs] r8938 - in trunk/freenet/src/freenet: keys node

[t...@freenetproject.org]

Author: toad
Date: 2006-05-29 21:29:30 +0000 (Mon, 29 May 2006)
New Revision: 8938

Modified:
   trunk/freenet/src/freenet/keys/FreenetURI.java
   trunk/freenet/src/freenet/node/Version.java
Log:
755: Fix bug in FreenetURI which caused CHK at .../.../thing.gif to be 
truncated.

Modified: trunk/freenet/src/freenet/keys/FreenetURI.java
===================================================================
--- trunk/freenet/src/freenet/keys/FreenetURI.java      2006-05-29 21:00:43 UTC 
(rev 8937)
+++ trunk/freenet/src/freenet/keys/FreenetURI.java      2006-05-29 21:29:30 UTC 
(rev 8938)
@@ -227,12 +227,6 @@
                }
                URI = URI.substring(atchar + 1);

-        // strip 'file extensions' from CHKs
-        // added by aum (david at rebirthing.co.nz)
-        if ("CHK".equals(keyType)) {
-            URI = URI.split("[.]")[0];
-        }
-
                // decode metaString
                int slash2;
                Vector sv = new Vector();
@@ -281,7 +275,12 @@
                        metaStr = null;
                }

-               
+        // strip 'file extensions' from CHKs
+        // added by aum (david at rebirthing.co.nz)
+        if ("CHK".equals(keyType)) {
+            URI = URI.split("[.]")[0];
+        }
+
                // URI now contains: routingKey[,cryptoKey][,metaInfo]
                StringTokenizer st = new StringTokenizer(URI, ",");
                try {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-29 21:00:43 UTC (rev 
8937)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-29 21:29:30 UTC (rev 
8938)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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