diff options
author | Nobuaki Sukegawa <nsuke@apache.org> | 2016-10-01 22:38:55 +0900 |
---|---|---|
committer | Nobuaki Sukegawa <nsuke@apache.org> | 2016-10-03 01:04:31 +0900 |
commit | b0dadbde6aad1f5a09d47e3d1f2c713c76cd915f (patch) | |
tree | 18da187626cad0832b0a102c3db40ba4b3e47d08 | |
parent | b413703eef78a3557ca6a1df073ad1eaecb4a936 (diff) | |
download | thrift-b0dadbde6aad1f5a09d47e3d1f2c713c76cd915f.tar.gz |
THRIFT-3902 TFramedTransport.open throws NullPointerException
This closes #1105
-rw-r--r-- | lib/java/src/org/apache/thrift/transport/TSocket.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/java/src/org/apache/thrift/transport/TSocket.java b/lib/java/src/org/apache/thrift/transport/TSocket.java index bc44209d6..148122f7e 100644 --- a/lib/java/src/org/apache/thrift/transport/TSocket.java +++ b/lib/java/src/org/apache/thrift/transport/TSocket.java @@ -40,27 +40,27 @@ public class TSocket extends TIOStreamTransport { /** * Wrapped Socket object */ - private Socket socket_ = null; + private Socket socket_; /** * Remote host */ - private String host_ = null; + private String host_; /** * Remote port */ - private int port_ = 0; + private int port_; /** * Socket timeout - read timeout on the socket */ - private int socketTimeout_ = 0; + private int socketTimeout_; /** * Connection timeout */ - private int connectTimeout_ = 0; + private int connectTimeout_; /** * Constructor that takes an already created socket. @@ -206,11 +206,11 @@ public class TSocket extends TIOStreamTransport { throw new TTransportException(TTransportException.ALREADY_OPEN, "Socket already connected."); } - if (host_.length() == 0) { + if (host_ == null || host_.length() == 0) { throw new TTransportException(TTransportException.NOT_OPEN, "Cannot open null host."); } - if (port_ <= 0) { - throw new TTransportException(TTransportException.NOT_OPEN, "Cannot open without port."); + if (port_ <= 0 || port_ > 65535) { + throw new TTransportException(TTransportException.NOT_OPEN, "Invalid port " + port_); } if (socket_ == null) { |