Don't need to nest else clause. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/003cada5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/003cada5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/003cada5
Branch: refs/heads/LOG4J2-1390 Commit: 003cada5de1188de6bc9879a599ae625d4a4e240 Parents: d7d1cf7 Author: Gary Gregory <[email protected]> Authored: Thu Sep 29 12:15:59 2016 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Sep 29 12:15:59 2016 -0700 ---------------------------------------------------------------------- .../log4j/core/appender/SocketAppender.java | 33 ++++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/003cada5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java index c9d9c2f..8178ca0 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java @@ -301,27 +301,26 @@ public class SocketAppender extends AbstractOutputStreamAppender<AbstractSocketM .withSslConfiguration(sslConfig) .build(); // @formatter:on - } else { - if (layout == null) { - layout = SerializedLayout.createLayout(); - } + } + if (layout == null) { + layout = SerializedLayout.createLayout(); + } - if (name == null) { - LOGGER.error("No name provided for SocketAppender"); - return null; - } + if (name == null) { + LOGGER.error("No name provided for SocketAppender"); + return null; + } - final Protocol actualProtocol = protocol != null ? protocol : Protocol.TCP; - if (actualProtocol == Protocol.UDP) { - immediateFlush = true; - } + final Protocol actualProtocol = protocol != null ? protocol : Protocol.TCP; + if (actualProtocol == Protocol.UDP) { + immediateFlush = true; + } - final AbstractSocketManager manager = createSocketManager(name, actualProtocol, host, port, - connectTimeoutMillis, sslConfig, reconnectDelayMillis, immediateFail, layout, Constants.ENCODER_BYTE_BUFFER_SIZE); + final AbstractSocketManager manager = createSocketManager(name, actualProtocol, host, port, + connectTimeoutMillis, sslConfig, reconnectDelayMillis, immediateFail, layout, Constants.ENCODER_BYTE_BUFFER_SIZE); - return new SocketAppender(name, layout, filter, manager, ignoreExceptions, immediateFlush, - advertise ? configuration.getAdvertiser() : null); - } + return new SocketAppender(name, layout, filter, manager, ignoreExceptions, immediateFlush, + advertise ? configuration.getAdvertiser() : null); } /** * Creates a socket appender.
