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

[t...@freenetproject.org]

Author: toad
Date: 2006-12-19 19:18:16 +0000 (Tue, 19 Dec 2006)
New Revision: 11490

Modified:
   trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Don't add extension twice.

Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-12-19 18:45:47 UTC 
(rev 11489)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java   2006-12-19 19:18:16 UTC 
(rev 11490)
@@ -679,8 +679,11 @@
                } else ext = null;
                String extAdd = (ext == null ? "" : '.' + ext);
                String preferred = uri.getPreferredFilename();
-               File f = new File(core.getDownloadDir(), preferred + extAdd);
-               File f1 = new File(core.getDownloadDir(), preferred + 
".freenet-tmp");
+               String preferredWithExt = preferred;
+               if(!(ext != null && preferredWithExt.endsWith(ext)))
+                       preferredWithExt += extAdd;
+               File f = new File(core.getDownloadDir(), preferredWithExt);
+               File f1 = new File(core.getDownloadDir(), preferredWithExt + 
".freenet-tmp");
                int x = 0;
                while(f.exists() || f1.exists()) {
                        f = new File(core.getDownloadDir(), preferred + '-' + x 
+ extAdd);