Wait I'm confused, aren't you supposed to use the return value from traceEntry() inside traceExit()?
On 17 April 2016 at 18:52, <[email protected]> wrote: > Repository: logging-log4j2 > Updated Branches: > refs/heads/master f30bd69f8 -> 5f692411a > > > Do not use our own deprecated code. > > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > Commit: > http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5f692411 > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5f692411 > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5f692411 > > Branch: refs/heads/master > Commit: 5f692411a4568946ae4dfe053c9de19635dde18e > Parents: f30bd69 > Author: ggregory <[email protected]> > Authored: Sun Apr 17 16:52:55 2016 -0700 > Committer: ggregory <[email protected]> > Committed: Sun Apr 17 16:52:55 2016 -0700 > > ---------------------------------------------------------------------- > .../log4j/core/net/server/TcpSocketServer.java | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > ---------------------------------------------------------------------- > > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5f692411/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java > ---------------------------------------------------------------------- > diff --git > a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java > b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java > index db5917c..9103a01 100644 > --- > a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java > +++ > b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/server/TcpSocketServer.java > @@ -56,7 +56,7 @@ public class TcpSocketServer<T extends InputStream> > extends AbstractSocketServer > > @Override > public void run() { > - logger.entry(); > + logger.traceEntry(); > boolean closed = false; > try { > try { > @@ -80,7 +80,7 @@ public class TcpSocketServer<T extends InputStream> > extends AbstractSocketServer > } finally { > handlers.remove(Long.valueOf(getId())); > } > - logger.exit(); > + logger.traceExit(); > } > > public void shutdown() { > @@ -218,7 +218,7 @@ public class TcpSocketServer<T extends InputStream> > extends AbstractSocketServer > */ > @Override > public void run() { > - logger.entry(); > + logger.traceEntry(); > while (isActive()) { > if (serverSocket.isClosed()) { > return; > @@ -240,7 +240,7 @@ public class TcpSocketServer<T extends InputStream> > extends AbstractSocketServer > } catch (final IOException e) { > if (serverSocket.isClosed()) { > // OK we're done. > - logger.exit(); > + logger.traceExit(); > return; > } > logger.error("Exception encountered on accept. Ignoring. > Stack Trace :", e); > @@ -255,7 +255,7 @@ public class TcpSocketServer<T extends InputStream> > extends AbstractSocketServer > // Ignore the exception > } > } > - logger.exit(); > + logger.traceExit(); > } > > /** > @@ -264,10 +264,10 @@ public class TcpSocketServer<T extends InputStream> > extends AbstractSocketServer > * @throws IOException if the server socket could not be closed > */ > public void shutdown() throws IOException { > - logger.entry(); > + logger.traceEntry(); > setActive(false); > Thread.currentThread().interrupt(); > serverSocket.close(); > - logger.exit(); > + logger.traceExit(); > } > } > > -- Matt Sicker <[email protected]>
