r27115 - trunk/freenet/src/freenet/support

Author: toad
Date: 2009-04-20 20:32:05 +0000 (Mon, 20 Apr 2009)
New Revision: 27115

Modified:
   trunk/freenet/src/freenet/support/FileLoggerHook.java
Log:
Move dconrado's old logs moving code out of the loop over files


Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java	2009-04-20 20:23:24 UTC (rev 27114)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java	2009-04-20 20:32:05 UTC (rev 27115)
@@ -593,18 +593,6 @@
 				gc.set(Calendar.SECOND, 0);
 				gc.set(Calendar.MILLISECOND, 0);
 				long startTime = gc.getTimeInMillis();
-				//If a compressed log file already exists for a given date,
-				//add a number to the end of the file that already exists
-				for(int a = 1; currentFilename != null && currentFilename.exists(); a++){
-					numericSameDateFilename = new File(getHourLogName(gc, a, true));
-					if(numericSameDateFilename != null && numericSameDateFilename.exists()){
-						currentFilename = numericSameDateFilename;
-					}
-					else{
-						FileUtil.renameTo(currentFilename, numericSameDateFilename);
-						currentFilename = numericSameDateFilename;
-					}
-				}
 				if(oldFile != null) {
 					long l = oldFile.length();
 					OldLogFile olf = new OldLogFile(oldFile, lastStartTime, startTime, l);
@@ -622,6 +610,18 @@
 				Logger.normal(this, "Unknown file: "+name+" in the log directory");
 			}
 		}
+		//If a compressed log file already exists for a given date,
+		//add a number to the end of the file that already exists
+		for(int a = 1; currentFilename != null && currentFilename.exists(); a++){
+			numericSameDateFilename = new File(getHourLogName(gc, a, true));
+			if(numericSameDateFilename != null && numericSameDateFilename.exists()){
+				currentFilename = numericSameDateFilename;
+			}
+			else{
+				FileUtil.renameTo(currentFilename, numericSameDateFilename);
+				currentFilename = numericSameDateFilename;
+			}
+		}
 		if(oldFile != null) {
 			long l = oldFile.length();
 			OldLogFile olf = new OldLogFile(oldFile, lastStartTime, System.currentTimeMillis(), l);