[freenet-cvs] r23340 - trunk/freenet/src/freenet/support

[j16s...@freenetproject.org]

Author: j16sdiz
Date: 2008-11-06 08:44:54 +0000 (Thu, 06 Nov 2008)
New Revision: 23340

Modified:
   trunk/freenet/src/freenet/support/FileLoggerHook.java
Log:
refactor 1: remove local variable

Modified: trunk/freenet/src/freenet/support/FileLoggerHook.java
===================================================================
--- trunk/freenet/src/freenet/support/FileLoggerHook.java       2008-11-06 
08:44:34 UTC (rev 23339)
+++ trunk/freenet/src/freenet/support/FileLoggerHook.java       2008-11-06 
08:44:54 UTC (rev 23340)
@@ -218,7 +218,6 @@
                        long startTime;
                        long nextHour = -1;
                        GregorianCalendar gc = null;
-                       String filename = null;
                        if (baseFilename != null) {
                                latestFile = new 
File(baseFilename+"-latest.log");
                                previousFile = new 
File(baseFilename+"-previous.log");
@@ -244,8 +243,7 @@
                                        int x = gc.get(INTERVAL);
                                        gc.set(INTERVAL, (x / 
INTERVAL_MULTIPLIER) * INTERVAL_MULTIPLIER);
                                }
-                               filename = getHourLogName(gc, true);
-                               currentFilename = new File(filename);
+                               currentFilename = new File(getHourLogName(gc, 
true));
                                synchronized(logFiles) {
                                        if ((!logFiles.isEmpty()) && 
logFiles.getLast().filename.equals(currentFilename)) {
                                                logFiles.removeLast();
@@ -268,6 +266,7 @@
                                        thisTime = System.currentTimeMillis();
                                        if (baseFilename != null) {
                                                if ((thisTime > nextHour) || 
switchedBaseFilename) {
+                                                       {
                                                        // Switch logs
                                                        try {
                                                                
logStream.flush();
@@ -284,16 +283,14 @@
                                                        }
                                                        long length = 
currentFilename.length();
                                                        OldLogFile olf = new 
OldLogFile(currentFilename, lastTime, nextHour, length);
-                                                       lastTime = nextHour;
                                                        synchronized(logFiles) {
                                                                
logFiles.addLast(olf);
                                                        }
                                                        
oldLogFilesDiskSpaceUsage += length;
                                                        trimOldLogFiles();
                                                        // Rotate primary log 
stream
-                                                       filename = 
getHourLogName(gc, true);
-                                                       currentFilename = new 
File(filename);
-                                                       logStream = 
openNewLogFile(new File(filename), true);
+                                                       currentFilename = new 
File(getHourLogName(gc, true));
+                                                       logStream = 
openNewLogFile(currentFilename, true);
                                                        if(latestFile != null) {
                                                                try {
                                                                        
altLogStream.close();
@@ -306,6 +303,7 @@
                                                                
latestFile.delete();
                                                                altLogStream = 
openNewLogFile(latestFile, false);
                                                        }
+                                                       }
                                                        
//System.err.println("Rotated log files: "+filename);
                                                        
//System.err.println("Almost rotated");
                                                        gc.add(INTERVAL, 
INTERVAL_MULTIPLIER);