partial revert of 6df9f4e154d148867ee158cbe9e9acf3fb73d680

This commit is contained in:
dg2-new
2013-11-10 23:00:57 +00:00
parent addd2e6d6a
commit 108039de08
3 changed files with 3 additions and 2 deletions

View File

@@ -116,7 +116,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
* @param buf data to be sent - may be null * @param buf data to be sent - may be null
* @param off offset into the buffer to start writing from * @param off offset into the buffer to start writing from
* @param size how many bytes of the buffer to write (may be 0) * @param size how many bytes of the buffer to write (may be 0)
* @return the packet sent, or null if the connection died * @return the packet sent
*/ */
public PacketLocal send(byte buf[], int off, int size) { public PacketLocal send(byte buf[], int off, int size) {
return send(buf, off, size, false); return send(buf, off, size, false);

View File

@@ -113,7 +113,7 @@ public class Clock implements Timestamper.UpdateListener {
/* /*
* @return the current delta from System.currentTimeMillis() in milliseconds * @return the current delta from System.currentTimeMillis() in milliseconds
*/ */
public synchronized long getOffset() { public long getOffset() {
return _offset; return _offset;
} }

View File

@@ -283,6 +283,7 @@ public class TunnelPoolSettings {
} }
private static final boolean getBoolean(String str, boolean defaultValue) { private static final boolean getBoolean(String str, boolean defaultValue) {
if (str == null) return defaultValue;
boolean v = Boolean.parseBoolean(str) || boolean v = Boolean.parseBoolean(str) ||
(str != null && "YES".equals(str.toUpperCase(Locale.US))); (str != null && "YES".equals(str.toUpperCase(Locale.US)));
return v; return v;