You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2018/08/01 15:39:56 UTC
logging-log4j2 git commit: Bullet-proof test tear downs to avoid
spurious failures.
Repository: logging-log4j2
Updated Branches:
refs/heads/release-2.x 365593315 -> 690709edc
Bullet-proof test tear downs to avoid spurious failures.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/690709ed
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/690709ed
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/690709ed
Branch: refs/heads/release-2.x
Commit: 690709edc712fd153f531c25b55fa3fc35fb634b
Parents: 3655933
Author: Gary Gregory <gg...@apache.org>
Authored: Wed Aug 1 09:39:52 2018 -0600
Committer: Gary Gregory <gg...@apache.org>
Committed: Wed Aug 1 09:39:52 2018 -0600
----------------------------------------------------------------------
.../core/net/mock/MockTcpSyslogServer.java | 28 +++++++++++---------
.../core/net/mock/MockTlsSyslogServer.java | 21 ++++++++-------
.../core/net/mock/MockUdpSyslogServer.java | 16 ++++++-----
3 files changed, 38 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/690709ed/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
index be79192..ea41e61 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTcpSyslogServer.java
@@ -23,28 +23,32 @@ import java.net.ServerSocket;
import java.net.Socket;
public class MockTcpSyslogServer extends MockSyslogServer {
- private final ServerSocket sock;
+ private final ServerSocket socketServer;
private volatile boolean shutdown = false;
private Thread thread;
public MockTcpSyslogServer(final int numberOfMessagesToReceive, final int port) throws IOException {
super(numberOfMessagesToReceive, port);
- sock = new ServerSocket(port);
+ socketServer = new ServerSocket(port);
}
@Override
public void shutdown() {
this.shutdown = true;
- try {
- sock.close();
- } catch (final IOException e) {
- e.printStackTrace();
+ if (socketServer != null) {
+ try {
+ socketServer.close();
+ } catch (final IOException e) {
+ e.printStackTrace();
+ }
}
- thread.interrupt();
- try {
- thread.join(100);
- } catch (InterruptedException ie) {
- System.out.println("Shutdown of TCP server thread failed.");
+ if (thread != null) {
+ thread.interrupt();
+ try {
+ thread.join(100);
+ } catch (InterruptedException ie) {
+ System.out.println("Shutdown of TCP server thread failed.");
+ }
}
}
@@ -57,7 +61,7 @@ public class MockTcpSyslogServer extends MockSyslogServer {
final byte[] buffer = new byte[4096];
Socket socket = null;
try {
- socket = sock.accept();
+ socket = socketServer.accept();
socket.setSoLinger(true, 0);
final InputStream in = socket.getInputStream();
int i = in.read(buffer, 0, buffer.length);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/690709ed/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
index b96b4f5..a445464 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockTlsSyslogServer.java
@@ -53,20 +53,23 @@ public class MockTlsSyslogServer extends MockSyslogServer {
public void shutdown() {
this.shutdown = true;
try {
- try {
- this.serverSocket.close();
- }
- catch (final Exception e) {
- e.printStackTrace();
+ if (serverSocket != null) {
+ try {
+ this.serverSocket.close();
+ } catch (final Exception e) {
+ e.printStackTrace();
+ }
}
this.interrupt();
} catch (final Exception e) {
e.printStackTrace();
}
- try {
- thread.join(100);
- } catch (InterruptedException ie) {
- System.out.println("Shutdown of TLS server thread failed.");
+ if (thread != null) {
+ try {
+ thread.join(100);
+ } catch (InterruptedException ie) {
+ System.out.println("Shutdown of TLS server thread failed.");
+ }
}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/690709ed/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
index ce379d8..a74940b 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/net/mock/MockUdpSyslogServer.java
@@ -35,12 +35,16 @@ public class MockUdpSyslogServer extends MockSyslogServer {
@Override
public void shutdown() {
this.shutdown = true;
- socket.close();
- thread.interrupt();
- try {
- thread.join(100);
- } catch (InterruptedException ie) {
- System.out.println("Shutdown of Log4j UDP server thread failed.");
+ if (socket != null) {
+ socket.close();
+ }
+ if (thread != null) {
+ thread.interrupt();
+ try {
+ thread.join(100);
+ } catch (InterruptedException ie) {
+ System.out.println("Shutdown of Log4j UDP server thread failed.");
+ }
}
}