reverted change by mistake in yacyVersion

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4740 6c8d7289-2bf4-0310-a012-ef5d649a1542

source/de/anomic/yacy/yacyVersion.java

@@ -37,6 +37,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -510,7 +511,7 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
         String[] downloaded = filesPath.list();
           
         // parse all filenames and put them in a sorted set
-        TreeSet<yacyVersion> downloadedreleases = new TreeSet<yacyVersion>();
+        SortedSet<yacyVersion> downloadedreleases = new TreeSet<yacyVersion>();
         for (int j = 0; j < downloaded.length; j++) {
             try {
                 release = new yacyVersion(downloaded[j]);
@@ -533,22 +534,25 @@ public final class yacyVersion implements Comparator<yacyVersion>, Comparable<ya
             // remove old files
             long now = System.currentTimeMillis();
             final long deleteAfterMillis = deleteAfterDays * 24 * 60 * 60000l;
-            final Iterator<yacyVersion> iter = downloadedreleases.iterator();
+            
-            while (iter.hasNext()) {
+            String lastMain = null;
-                release = iter.next();
+            String filename;
-                
+            for (final yacyVersion aRelease : downloadedreleases) {
-                if(keepMain && release.mainRelease) {
+                filename = aRelease.name;
-                    // we found the latest main release
+                if (keepMain && aRelease.mainRelease) {
-                    keepMain = false;
+                    // keep this one, delete last remembered main release file
-                    continue;
+                    if (lastMain != null) {
+                        filename = lastMain;
+                    }
+                    lastMain = aRelease.name;
                 }
 
                 // check file age
-                File downloadedFile = new File(filesPath + File.separator + release.name);
+                File downloadedFile = new File(filesPath + File.separator + filename);
-                if(now - downloadedFile.lastModified() > deleteAfterMillis) {
+                if (now - downloadedFile.lastModified() > deleteAfterMillis) {
                     // delete file
-                    if(!downloadedFile.delete()) {
+                    if (!downloadedFile.delete()) {
-                        serverLog.logWarning("STARTUP", "cannot delete old release "+ downloadedFile.getAbsolutePath());
+                        serverLog.logWarning("STARTUP", "cannot delete old release " + downloadedFile.getAbsolutePath());
                     }
                 }
             }