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 2016/12/12 20:19:14 UTC
logging-log4j2 git commit: Formatting.
Repository: logging-log4j2
Updated Branches:
refs/heads/master c9a87be89 -> 8e7c76792
Formatting.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8e7c7679
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8e7c7679
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8e7c7679
Branch: refs/heads/master
Commit: 8e7c76792bb48b44c93cd50bf441ba3c049110c1
Parents: c9a87be
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Dec 12 12:19:12 2016 -0800
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Dec 12 12:19:12 2016 -0800
----------------------------------------------------------------------
.../apache/logging/log4j/core/net/SslSocketManager.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8e7c7679/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
index cf7816e..269c319 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/SslSocketManager.java
@@ -175,23 +175,21 @@ public class SslSocketManager extends TcpSocketManager {
InetAddress inetAddress = null;
OutputStream os = null;
Socket socket = null;
-
try {
inetAddress = resolveAddress(data.host);
socket = createSocket(data);
os = socket.getOutputStream();
checkDelay(data.delayMillis, os);
- }
- catch (final IOException e) {
+ } catch (final IOException e) {
LOGGER.error("SslSocketManager ({})", name, e);
os = new ByteArrayOutputStream();
- }
- catch (final TlsSocketManagerFactoryException e) {
+ } catch (final TlsSocketManagerFactoryException e) {
LOGGER.catching(Level.DEBUG, e);
return null;
}
return new SslSocketManager(name, os, socket, data.sslConfiguration, inetAddress, data.host, data.port,
- data.connectTimeoutMillis, data.delayMillis, data.immediateFail, data.layout, data.bufferSize, data.socketOptions);
+ data.connectTimeoutMillis, data.delayMillis, data.immediateFail, data.layout, data.bufferSize,
+ data.socketOptions);
}
private InetAddress resolveAddress(final String hostName) throws TlsSocketManagerFactoryException {