echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use ReadLine for SAMHandlerFactory

Browse Source
This commit is contained in:
zzz
2015-06-27 20:31:56 +00:00
parent 072e4dc2bf
commit 6e06d326e3
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/sam/java/src/net/i2p/sam/SAMHandlerFactory.java
View File

@ -46,14 +46,11 @@ class SAMHandlerFactory {
try { try {
Socket sock = s.socket(); Socket sock = s.socket();
sock.setSoTimeout(HELLO_TIMEOUT);
sock.setKeepAlive(true); sock.setKeepAlive(true);
String line = DataHelper.readLine(sock.getInputStream()); StringBuilder buf = new StringBuilder(128);
ReadLine.readLine(sock, buf, HELLO_TIMEOUT);
String line = buf.toString();
sock.setSoTimeout(0); sock.setSoTimeout(0);
if (line == null) {
log.debug("Connection closed by client");
return null;
}
tok = new StringTokenizer(line.trim(), " "); tok = new StringTokenizer(line.trim(), " ");
} catch (SocketTimeoutException e) { } catch (SocketTimeoutException e) {
throw new SAMException("Timeout waiting for HELLO VERSION", e); throw new SAMException("Timeout waiting for HELLO VERSION", e);