From 2972e79f9e2280dc5cfffb0347ec1ca5c716e8b5 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 3 Aug 2012 11:22:48 +0000
Subject: [PATCH] * OutNetMessage: Fix NPE when log level = INFO (ticket #676)
---
router/java/src/net/i2p/router/OutNetMessage.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java
index d52ef380b2..d3fb99175d 100644
--- a/router/java/src/net/i2p/router/OutNetMessage.java
+++ b/router/java/src/net/i2p/router/OutNetMessage.java
@@ -325,7 +325,7 @@ public class OutNetMessage {
buf.append(" with onFailedReply job: ").append(_onFailedReply);
if (_onFailedSend != null)
buf.append(" with onFailedSend job: ").append(_onFailedSend);
- if (_log.shouldLog(Log.INFO)) {
+ if (_timestamps != null && _timestampOrder != null && _log.shouldLog(Log.INFO)) {
buf.append(" {timestamps: \n");
renderTimestamps(buf);
buf.append("}");
@@ -335,7 +335,8 @@ public class OutNetMessage {
}
/**
- * Only useful if log level is INFO or DEBUG
+ * Only useful if log level is INFO or DEBUG;
+ * locked_initTimestamps() must have been called previously
*/
private void renderTimestamps(StringBuilder buf) {
synchronized (this) {
--
GitLab