From 2ea9fc5d61a4e9c192edfc0a70a920d0a0d9ef3a Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 2 Jan 2013 13:17:02 +0000
Subject: [PATCH] I2CP: Remove static logs; Fix thread ID counter
---
.../src/net/i2p/data/i2cp/I2CPMessageReader.java | 12 +++++++-----
core/java/src/net/i2p/data/i2cp/SessionConfig.java | 3 ++-
.../net/i2p/internal/QueuedI2CPMessageReader.java | 2 +-
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java b/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
index 39633881e8..7dd702cf28 100644
--- a/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
+++ b/core/java/src/net/i2p/data/i2cp/I2CPMessageReader.java
@@ -11,7 +11,9 @@ package net.i2p.data.i2cp;
import java.io.IOException;
import java.io.InputStream;
+import java.util.concurrent.atomic.AtomicLong;
+import net.i2p.I2PAppContext;
import net.i2p.util.I2PThread;
import net.i2p.util.Log;
@@ -25,13 +27,12 @@ import net.i2p.util.Log;
* @author jrandom
*/
public class I2CPMessageReader {
- private final static Log _log = new Log(I2CPMessageReader.class);
private InputStream _stream;
protected I2CPMessageEventListener _listener;
protected I2CPMessageReaderRunner _reader;
protected Thread _readerThread;
- protected static volatile long __readerId = 0;
+ protected static final AtomicLong __readerId = new AtomicLong();
public I2CPMessageReader(InputStream stream, I2CPMessageEventListener lsnr) {
_stream = stream;
@@ -39,7 +40,7 @@ public class I2CPMessageReader {
_reader = new I2CPMessageReaderRunner();
_readerThread = new I2PThread(_reader);
_readerThread.setDaemon(true);
- _readerThread.setName("I2CP Reader " + (++__readerId));
+ _readerThread.setName("I2CP Reader " + __readerId.incrementAndGet());
}
/**
@@ -125,6 +126,7 @@ public class I2CPMessageReader {
protected class I2CPMessageReaderRunner implements Runnable {
protected volatile boolean _doRun;
protected volatile boolean _stayAlive;
+ private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(I2CPMessageReader.class);
public I2CPMessageReaderRunner() {
_doRun = true;
@@ -162,9 +164,9 @@ public class I2CPMessageReader {
try {
I2CPMessage msg = I2CPMessageHandler.readMessage(_stream);
if (msg != null) {
- _log.debug("Before handling the newly received message");
+ //_log.debug("Before handling the newly received message");
_listener.messageReceived(I2CPMessageReader.this, msg);
- _log.debug("After handling the newly received message");
+ //_log.debug("After handling the newly received message");
}
} catch (I2CPMessageException ime) {
_log.warn("Error handling message", ime);
diff --git a/core/java/src/net/i2p/data/i2cp/SessionConfig.java b/core/java/src/net/i2p/data/i2cp/SessionConfig.java
index 14b324a4e0..663f7fcd49 100644
--- a/core/java/src/net/i2p/data/i2cp/SessionConfig.java
+++ b/core/java/src/net/i2p/data/i2cp/SessionConfig.java
@@ -17,6 +17,7 @@ import java.util.Date;
import java.util.Map;
import java.util.Properties;
+import net.i2p.I2PAppContext;
import net.i2p.crypto.DSAEngine;
import net.i2p.data.DataFormatException;
import net.i2p.data.DataHelper;
@@ -34,7 +35,7 @@ import net.i2p.util.OrderedProperties;
* @author jrandom
*/
public class SessionConfig extends DataStructureImpl {
- private final static Log _log = new Log(SessionConfig.class);
+ private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(SessionConfig.class);
private Destination _destination;
private Signature _signature;
private Date _creationDate;
diff --git a/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java b/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
index 4b14d5ed8c..3e87a8e2f2 100644
--- a/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
+++ b/core/java/src/net/i2p/internal/QueuedI2CPMessageReader.java
@@ -20,7 +20,7 @@ public class QueuedI2CPMessageReader extends I2CPMessageReader {
super(lsnr);
this.in = in;
_reader = new QueuedI2CPMessageReaderRunner();
- _readerThread = new I2PThread(_reader, "I2CP Internal Reader " + (++__readerId), true);
+ _readerThread = new I2PThread(_reader, "I2CP Internal Reader " + __readerId.incrementAndGet(), true);
}
protected class QueuedI2CPMessageReaderRunner extends I2CPMessageReaderRunner implements Runnable {
--
GitLab