From 6a7e0ec908cf10c5f6399f7989a575952337a8d2 Mon Sep 17 00:00:00 2001
From: hns <hannesw@gmail.com>
Date: Mon, 14 Oct 2002 15:39:45 +0000
Subject: [PATCH] Fixed bug 128 (Logger NullPointerException), moved some code.

---
 src/helma/util/Logger.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/helma/util/Logger.java b/src/helma/util/Logger.java
index 9251e83c..ff724a6a 100644
--- a/src/helma/util/Logger.java
+++ b/src/helma/util/Logger.java
@@ -161,11 +161,6 @@ public final class Logger {
 	if (entries.isEmpty ())
 	    return;
 	try {
-	    if (logfile != null &&
-	          (writer == null || !logfile.exists() || !logfile.canWrite())) {
-	        // rotate the log file if we can't write to it
-	        rotateLogFile ();
-	    }
 
 	    int l = entries.size();
 
@@ -177,6 +172,10 @@ public final class Logger {
 	            out.println (entry);
 	        }
 	    } else {
+	        if (writer == null || !logfile.exists() || !logfile.canWrite()) {
+	            // rotate the log file if we can't write to it
+	            rotateLogFile ();
+	        }
 	        for (int i=0; i<l; i++) {
 	            String entry = (String) entries.get (0);
 	            entries.remove (0);
@@ -203,6 +202,9 @@ public final class Logger {
      *  start a new one.
      */
     private void rotateLogFile () throws IOException {
+	// if the logger is not file based do nothing
+	if (logfile == null)
+	    return;
 	if (writer != null) try {
 	    writer.close();
 	} catch (Exception ignore) {}