From f8830a759effec16a6cfe12513e405da3b2ad3da Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 4 Nov 2015 15:01:56 +0000
Subject: [PATCH] Threads: More conversions to I2PAppThread
---
.../java/src/net/i2p/addressbook/DaemonThread.java | 3 ++-
apps/jetty/java/src/net/i2p/jetty/JettyStart.java | 5 +++--
core/java/src/net/i2p/util/LogManager.java | 2 +-
core/java/src/net/i2p/util/ShellCommand.java | 8 ++++----
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
index fe74c7a83a..b0689a2081 100644
--- a/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
+++ b/apps/addressbook/java/src/net/i2p/addressbook/DaemonThread.java
@@ -25,6 +25,7 @@ import java.util.Properties;
import net.i2p.I2PAppContext;
import net.i2p.client.naming.NamingServiceUpdater;
+import net.i2p.util.I2PAppThread;
/**
* A thread that waits five minutes, then runs the addressbook daemon.
@@ -32,7 +33,7 @@ import net.i2p.client.naming.NamingServiceUpdater;
* @author Ragnarok
*
*/
-public class DaemonThread extends Thread implements NamingServiceUpdater {
+public class DaemonThread extends I2PAppThread implements NamingServiceUpdater {
private String[] args;
diff --git a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
index c5f9e2aaff..79fec449c7 100644
--- a/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
+++ b/apps/jetty/java/src/net/i2p/jetty/JettyStart.java
@@ -26,6 +26,7 @@ import java.util.Properties;
import net.i2p.I2PAppContext;
import net.i2p.app.*;
import static net.i2p.app.ClientAppState.*;
+import net.i2p.util.I2PAppThread;
import net.i2p.util.PortMapper;
import org.eclipse.jetty.server.Connector;
@@ -109,7 +110,7 @@ public class JettyStart implements ClientApp {
}
}
- private class Starter extends Thread {
+ private class Starter extends I2PAppThread {
public Starter() {
super("JettyStarter");
changeState(STARTING);
@@ -161,7 +162,7 @@ public class JettyStart implements ClientApp {
}
}
- private class Stopper extends Thread {
+ private class Stopper extends I2PAppThread {
public Stopper() {
super("JettyStopper");
changeState(STOPPING);
diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java
index f2df0a8817..ca2476de83 100644
--- a/core/java/src/net/i2p/util/LogManager.java
+++ b/core/java/src/net/i2p/util/LogManager.java
@@ -763,7 +763,7 @@ public class LogManager implements Flushable {
private static final AtomicInteger __id = new AtomicInteger();
- private class ShutdownHook extends Thread {
+ private class ShutdownHook extends I2PAppThread {
private final int _id;
public ShutdownHook() {
_id = __id.incrementAndGet();
diff --git a/core/java/src/net/i2p/util/ShellCommand.java b/core/java/src/net/i2p/util/ShellCommand.java
index 70de62ea85..955830fe1e 100644
--- a/core/java/src/net/i2p/util/ShellCommand.java
+++ b/core/java/src/net/i2p/util/ShellCommand.java
@@ -51,7 +51,7 @@ public class ShellCommand {
*
* @author hypercubus
*/
- private class CommandThread extends Thread {
+ private class CommandThread extends I2PAppThread {
private final boolean consumeOutput;
private final Object shellCommand;
private final Result result;
@@ -84,7 +84,7 @@ public class ShellCommand {
*
* @author hypercubus
*/
- private static class StreamConsumer extends Thread {
+ private static class StreamConsumer extends I2PAppThread {
private final BufferedReader bufferedReader;
public StreamConsumer(InputStream inputStream) {
@@ -115,7 +115,7 @@ public class ShellCommand {
*
* @author hypercubus
*/
- private static class StreamReader extends Thread {
+ private static class StreamReader extends I2PAppThread {
private final BufferedReader bufferedReader;
public StreamReader(InputStream inputStream) {
@@ -149,7 +149,7 @@ public class ShellCommand {
*
* @author hypercubus
*/
- private static class StreamWriter extends Thread {
+ private static class StreamWriter extends I2PAppThread {
private final BufferedWriter bufferedWriter;
public StreamWriter(OutputStream outputStream) {
--
GitLab