You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by gg...@apache.org on 2018/09/14 19:05:31 UTC
httpcomponents-core git commit: Don't nest unnecessarily. Comment
empty blocks.
Repository: httpcomponents-core
Updated Branches:
refs/heads/4.4.x bb76bf739 -> 3507cd738
Don't nest unnecessarily. Comment empty blocks.
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/3507cd73
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/3507cd73
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/3507cd73
Branch: refs/heads/4.4.x
Commit: 3507cd738d3adecce4d4d81fc786c61548324161
Parents: bb76bf7
Author: Gary Gregory <gg...@rocketsoftware.com>
Authored: Fri Sep 14 13:05:28 2018 -0600
Committer: Gary Gregory <gg...@rocketsoftware.com>
Committed: Fri Sep 14 13:05:28 2018 -0600
----------------------------------------------------------------------
.../http/impl/SocketHttpClientConnection.java | 20 ++++++++------------
.../http/impl/SocketHttpServerConnection.java | 12 ++++--------
.../impl/io/AbstractSessionInputBuffer.java | 3 +--
.../http/protocol/DefaultedHttpContext.java | 3 +--
4 files changed, 14 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3507cd73/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpClientConnection.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpClientConnection.java b/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpClientConnection.java
index ac0d97e..f3cf3ed 100644
--- a/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpClientConnection.java
+++ b/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpClientConnection.java
@@ -164,36 +164,32 @@ public class SocketHttpClientConnection
public InetAddress getLocalAddress() {
if (this.socket != null) {
return this.socket.getLocalAddress();
- } else {
- return null;
}
+ return null;
}
@Override
public int getLocalPort() {
if (this.socket != null) {
return this.socket.getLocalPort();
- } else {
- return -1;
}
+ return -1;
}
@Override
public InetAddress getRemoteAddress() {
if (this.socket != null) {
return this.socket.getInetAddress();
- } else {
- return null;
}
+ return null;
}
@Override
public int getRemotePort() {
if (this.socket != null) {
return this.socket.getPort();
- } else {
- return -1;
}
+ return -1;
}
@Override
@@ -218,9 +214,8 @@ public class SocketHttpClientConnection
} catch (final SocketException ignore) {
return -1;
}
- } else {
- return -1;
}
+ return -1;
}
@Override
@@ -245,10 +240,12 @@ public class SocketHttpClientConnection
try {
sock.shutdownOutput();
} catch (final IOException ignore) {
+ // ignore
}
try {
sock.shutdownInput();
} catch (final IOException ignore) {
+ // ignore
}
} catch (final UnsupportedOperationException ignore) {
// if one isn't supported, the other one isn't either
@@ -282,9 +279,8 @@ public class SocketHttpClientConnection
formatAddress(buffer, remoteAddress);
}
return buffer.toString();
- } else {
- return super.toString();
}
+ return super.toString();
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3507cd73/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpServerConnection.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpServerConnection.java b/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpServerConnection.java
index fce3f53..53956f4 100644
--- a/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpServerConnection.java
+++ b/httpcore/src/main/java-deprecated/org/apache/http/impl/SocketHttpServerConnection.java
@@ -153,36 +153,32 @@ public class SocketHttpServerConnection extends
public InetAddress getLocalAddress() {
if (this.socket != null) {
return this.socket.getLocalAddress();
- } else {
- return null;
}
+ return null;
}
@Override
public int getLocalPort() {
if (this.socket != null) {
return this.socket.getLocalPort();
- } else {
- return -1;
}
+ return -1;
}
@Override
public InetAddress getRemoteAddress() {
if (this.socket != null) {
return this.socket.getInetAddress();
- } else {
- return null;
}
+ return null;
}
@Override
public int getRemotePort() {
if (this.socket != null) {
return this.socket.getPort();
- } else {
- return -1;
}
+ return -1;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3507cd73/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java b/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java
index 533a233..3248631 100644
--- a/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java
+++ b/httpcore/src/main/java-deprecated/org/apache/http/impl/io/AbstractSessionInputBuffer.java
@@ -393,9 +393,8 @@ public abstract class AbstractSessionInputBuffer implements SessionInputBuffer,
final int readLen = readLine(charbuffer);
if (readLen != -1) {
return charbuffer.toString();
- } else {
- return null;
}
+ return null;
}
@Override
http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/3507cd73/httpcore/src/main/java-deprecated/org/apache/http/protocol/DefaultedHttpContext.java
----------------------------------------------------------------------
diff --git a/httpcore/src/main/java-deprecated/org/apache/http/protocol/DefaultedHttpContext.java b/httpcore/src/main/java-deprecated/org/apache/http/protocol/DefaultedHttpContext.java
index 1217271..aff7063 100644
--- a/httpcore/src/main/java-deprecated/org/apache/http/protocol/DefaultedHttpContext.java
+++ b/httpcore/src/main/java-deprecated/org/apache/http/protocol/DefaultedHttpContext.java
@@ -56,9 +56,8 @@ public final class DefaultedHttpContext implements HttpContext {
final Object obj = this.local.getAttribute(id);
if (obj == null) {
return this.defaults.getAttribute(id);
- } else {
- return obj;
}
+ return obj;
}
@Override