From 39493e0f2496b98ad677d1f661b01d17336265be Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 10 Jun 2013 14:01:52 +0000
Subject: [PATCH] final and null check

---
 core/java/src/net/i2p/util/LogLimit.java           | 2 +-
 core/java/src/net/i2p/util/LogRecordFormatter.java | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/java/src/net/i2p/util/LogLimit.java b/core/java/src/net/i2p/util/LogLimit.java
index 1745299d7..e33aed88b 100644
--- a/core/java/src/net/i2p/util/LogLimit.java
+++ b/core/java/src/net/i2p/util/LogLimit.java
@@ -14,7 +14,7 @@ package net.i2p.util;
  *
  */
 class LogLimit {
-    private String _rootName;
+    private final String _rootName;
     private int _limit;
 
     public LogLimit(String name, int limit) {
diff --git a/core/java/src/net/i2p/util/LogRecordFormatter.java b/core/java/src/net/i2p/util/LogRecordFormatter.java
index 01fa3298f..d46a6ec76 100644
--- a/core/java/src/net/i2p/util/LogRecordFormatter.java
+++ b/core/java/src/net/i2p/util/LogRecordFormatter.java
@@ -60,7 +60,9 @@ class LogRecordFormatter {
                 buf.append(getPriority(rec, manager.getContext()));
                 break;
             case LogManager.MESSAGE:
-                buf.append(getWhat(rec));
+                String msg = getWhat(rec);
+                if (msg != null)
+                    buf.append(msg);
                 break;
             default:
                 buf.append(format[i]);