Always use blocks. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/40208bcf Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/40208bcf Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/40208bcf
Branch: refs/heads/master Commit: 40208bcfbb2f3ce3caed89fb310bd7c2048c813f Parents: 39fb971 Author: Gary Gregory <[email protected]> Authored: Thu Jul 6 03:11:48 2017 -0700 Committer: Gary Gregory <[email protected]> Committed: Thu Jul 6 03:11:48 2017 -0700 ---------------------------------------------------------------------- .../core/appender/HttpURLConnectionManager.java | 21 ++++++++++++++------ .../log4j/core/net/ssl/StoreConfiguration.java | 18 +++++++++++------ .../log4j/core/layout/GelfLayoutTest.java | 4 +++- 3 files changed, 30 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40208bcf/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java index e7a8519..f948803 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/HttpURLConnectionManager.java @@ -80,9 +80,15 @@ public class HttpURLConnectionManager extends HttpManager { urlConnection.setDoOutput(true); urlConnection.setDoInput(true); urlConnection.setRequestMethod(method); - if (connectTimeoutMillis > 0) urlConnection.setConnectTimeout(connectTimeoutMillis); - if (readTimeoutMillis > 0) urlConnection.setReadTimeout(readTimeoutMillis); - if (layout.getContentType() != null) urlConnection.setRequestProperty("Content-Type", layout.getContentType()); + if (connectTimeoutMillis > 0) { + urlConnection.setConnectTimeout(connectTimeoutMillis); + } + if (readTimeoutMillis > 0) { + urlConnection.setReadTimeout(readTimeoutMillis); + } + if (layout.getContentType() != null) { + urlConnection.setRequestProperty("Content-Type", layout.getContentType()); + } for (Property header : headers) { urlConnection.setRequestProperty( header.getName(), @@ -104,7 +110,9 @@ public class HttpURLConnectionManager extends HttpManager { byte[] buffer = new byte[1024]; try (InputStream is = urlConnection.getInputStream()) { - while (IOUtils.EOF != is.read(buffer)); + while (IOUtils.EOF != is.read(buffer)) { + ; + } } catch (IOException e) { StringBuilder errorMessage = new StringBuilder(); try (InputStream es = urlConnection.getErrorStream()) { @@ -120,10 +128,11 @@ public class HttpURLConnectionManager extends HttpManager { } } } - if (urlConnection.getResponseCode() > -1) + if (urlConnection.getResponseCode() > -1) { throw new IOException(errorMessage.toString()); - else + } else { throw e; + } } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40208bcf/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java index 8002287..24d878e 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/net/ssl/StoreConfiguration.java @@ -72,20 +72,26 @@ public class StoreConfiguration<T> { @Override public boolean equals(Object obj) { - if (this == obj) + if (this == obj) { return true; - if (obj == null) + } + if (obj == null) { return false; - if (getClass() != obj.getClass()) + } + if (getClass() != obj.getClass()) { return false; + } StoreConfiguration other = (StoreConfiguration) obj; if (location == null) { - if (other.location != null) + if (other.location != null) { return false; - } else if (!location.equals(other.location)) + } + } else if (!location.equals(other.location)) { return false; - if (!Arrays.equals(password, other.password)) + } + if (!Arrays.equals(password, other.password)) { return false; + } return true; } } http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/40208bcf/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java index b8d4372..095bec6 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/layout/GelfLayoutTest.java @@ -106,7 +106,9 @@ public class GelfLayoutTest { formattedAppender.start(); encodedAppender.start(); - if (host == null) host = NetUtils.getLocalHostname(); + if (host == null) { + host = NetUtils.getLocalHostname(); + } final JavaLookup javaLookup = new JavaLookup();
