From 108039de089c41294c7b99b38d96abb75a181469 Mon Sep 17 00:00:00 2001
From: dg2-new <dg2-new@mail.i2p>
Date: Sun, 10 Nov 2013 23:00:57 +0000
Subject: [PATCH] partial revert of 6df9f4e154d148867ee158cbe9e9acf3fb73d680
---
.../src/net/i2p/client/streaming/ConnectionDataReceiver.java | 2 +-
core/java/src/net/i2p/util/Clock.java | 2 +-
router/java/src/net/i2p/router/TunnelPoolSettings.java | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
index 4929024acb..c758f692b1 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionDataReceiver.java
@@ -116,7 +116,7 @@ class ConnectionDataReceiver implements MessageOutputStream.DataReceiver {
* @param buf data to be sent - may be null
* @param off offset into the buffer to start writing from
* @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) {
return send(buf, off, size, false);
diff --git a/core/java/src/net/i2p/util/Clock.java b/core/java/src/net/i2p/util/Clock.java
index 5cba4684e8..c8587f48eb 100644
--- a/core/java/src/net/i2p/util/Clock.java
+++ b/core/java/src/net/i2p/util/Clock.java
@@ -113,7 +113,7 @@ public class Clock implements Timestamper.UpdateListener {
/*
* @return the current delta from System.currentTimeMillis() in milliseconds
*/
- public synchronized long getOffset() {
+ public long getOffset() {
return _offset;
}
diff --git a/router/java/src/net/i2p/router/TunnelPoolSettings.java b/router/java/src/net/i2p/router/TunnelPoolSettings.java
index a63b4ef056..3016dadd6e 100644
--- a/router/java/src/net/i2p/router/TunnelPoolSettings.java
+++ b/router/java/src/net/i2p/router/TunnelPoolSettings.java
@@ -283,6 +283,7 @@ public class TunnelPoolSettings {
}
private static final boolean getBoolean(String str, boolean defaultValue) {
+ if (str == null) return defaultValue;
boolean v = Boolean.parseBoolean(str) ||
(str != null && "YES".equals(str.toUpperCase(Locale.US)));
return v;
--
GitLab