From f3bb20d750ba340d8eadc9cfe612103b2ad8b7c7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 30 Jul 2015 20:41:45 +0000
Subject: [PATCH] minor updates after review
---
.../java/src/net/i2p/i2ptunnel/GunzipOutputStream.java | 2 +-
.../java/src/net/i2p/router/update/ConsoleUpdateManager.java | 2 +-
.../java/src/net/i2p/router/update/NewsFetcher.java | 2 +-
apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java | 2 +-
core/java/src/net/i2p/client/impl/I2PSessionImpl.java | 2 +-
core/java/src/net/i2p/update/UpdateManager.java | 2 ++
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java
index 291d903db6..e0798567d8 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/GunzipOutputStream.java
@@ -25,7 +25,7 @@ class GunzipOutputStream extends InflaterOutputStream {
private final CRC32 _crc32;
private final byte _buf1[] = new byte[1];
private boolean _complete;
- private byte _footer[] = new byte[FOOTER_SIZE];
+ private final byte _footer[] = new byte[FOOTER_SIZE];
private long _bytesReceived;
private long _bytesReceivedAtCompletion;
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
index 04a8d779f5..ff0a900160 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
@@ -1050,7 +1050,7 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
uri = DataHelper.stripHTML(task.getURI().getPath());
buf.append(_("Install failed from {0}", uri));
} else {
- buf.append(_("Transfer failed from {0}"));
+ buf.append(_("Transfer failed from {0}", uri));
}
if (reason != null && reason.length() > 0) {
buf.append("<br>");
diff --git a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
index d6876383cb..19d8789084 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/NewsFetcher.java
@@ -136,7 +136,7 @@ class NewsFetcher extends UpdateRunner {
/**
* Add a query param for the local language to get translated news.
* Unchanged if disabled by property, if language is english,
- * or if URI already contains a language paramter
+ * or if URI already contains a language parameter
*
* @since 0.9.21
*/
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java
index 8cbd02304a..496f49ac14 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java
@@ -73,7 +73,7 @@ public class NetDbHelper extends HelperBase {
NetDbRenderer renderer = new NetDbRenderer(_context);
try {
renderNavBar();
- if (_routerPrefix != null || _version!= null || _country != null)
+ if (_routerPrefix != null || _version != null || _country != null)
renderer.renderRouterInfoHTML(_out, _routerPrefix, _version, _country);
else if (_lease)
renderer.renderLeaseSetHTML(_out, _debug);
diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
index 6d264549be..4307924dea 100644
--- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java
@@ -96,7 +96,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2
// established subsessions
private final ConcurrentHashMap<SessionId, SubSession> _subsessionMap;
private final Object _subsessionLock = new Object();
- private static final String MIN_SUBSESSION_VERSION = "0.9.19";
+ private static final String MIN_SUBSESSION_VERSION = "0.9.21";
private volatile boolean _routerSupportsSubsessions;
/** hostname of router - will be null if in RouterContext */
diff --git a/core/java/src/net/i2p/update/UpdateManager.java b/core/java/src/net/i2p/update/UpdateManager.java
index b5035ec95f..57065dcb3a 100644
--- a/core/java/src/net/i2p/update/UpdateManager.java
+++ b/core/java/src/net/i2p/update/UpdateManager.java
@@ -178,6 +178,7 @@ public interface UpdateManager {
* @since 0.9.21
*/
public boolean isUpdateInProgress(UpdateType type, String id);
+
/**
* Non-blocking. Does not check.
* Fails if check or update already in progress.
@@ -225,6 +226,7 @@ public interface UpdateManager {
/**
* The status on any update current or last finished.
* @return status or ""
+ * @since 0.9.21
*/
public String getStatus();
--
GitLab