From 8e672ea548b497150ecc1b03596080b1a69b7312 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 12 Mar 2011 16:09:57 +0000 Subject: [PATCH] * LogWriter: Prevent NPE after permissions fail --- core/java/src/net/i2p/util/LogWriter.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index 51108e18b..c141cc243 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -77,7 +77,8 @@ class LogWriter implements Runnable { writeRecord(rec); } try { - _currentOut.flush(); + if (_currentOut != null) + _currentOut.flush(); } catch (IOException ioe) { if (++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) System.err.println("Error writing the router log - disk full? " + ioe); @@ -180,7 +181,8 @@ class LogWriter implements Runnable { try { _currentOut = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(f), "UTF-8")); } catch (IOException ioe) { - System.err.println("Error rotating into [" + f.getAbsolutePath() + "]" + ioe); + if (++_diskFullMessageCount < MAX_DISKFULL_MESSAGES) + System.err.println("Error creating log file [" + f.getAbsolutePath() + "]" + ioe); } }