From 44f4e551b7d32f58706a7891f9e8a2e25044c70e Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Fri, 8 Jul 2011 17:54:57 +0000
Subject: [PATCH] more misc findbugs
---
.../src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java | 3 ++-
.../java/src/net/i2p/client/streaming/Connection.java | 2 +-
.../src/java/src/i2p/susi/dns/AddressbookBean.java | 3 ++-
.../java/src/net/i2p/apps/systray/UrlLauncher.java | 3 ++-
core/java/src/net/i2p/crypto/TrustedUpdate.java | 11 +++++------
.../i2p/router/networkdb/kademlia/KBucketImpl.java | 2 +-
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
index 1014a986b7..37b7f8e454 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
@@ -305,7 +305,8 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
else
response = SUCCESS_RESPONSE;
Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
- I2PTunnelRunner runner = new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
+ // starts itself
+ new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
} catch (SocketException ex) {
_log.info(getPrefix(requestId) + "Error trying to connect", ex);
handleConnectClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
index 239c77d1b2..0eb8fe66ff 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/Connection.java
@@ -347,7 +347,7 @@ class Connection {
_log.debug("Resend in " + timeout + " for " + packet);
// schedules itself
- ResendPacketEvent rpe = new ResendPacketEvent(packet, timeout);
+ new ResendPacketEvent(packet, timeout);
}
// warning, getStatLog() can be null
diff --git a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
index 9aa327c052..2ada2b3b63 100644
--- a/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
+++ b/apps/susidns/src/java/src/i2p/susi/dns/AddressbookBean.java
@@ -300,7 +300,8 @@ public class AddressbookBean
} else {
boolean valid = true;
try {
- Destination dest = new Destination(destination);
+ // just to check validity
+ new Destination(destination);
} catch (DataFormatException dfe) {
valid = false;
}
diff --git a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
index 93d9d36bba..67643b6776 100644
--- a/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
+++ b/apps/systray/java/src/net/i2p/apps/systray/UrlLauncher.java
@@ -225,7 +225,8 @@ public class UrlLauncher {
private boolean validateUrlFormat(String urlString) {
try {
- URL url = new URL(urlString);
+ // just to check validity
+ new URL(urlString);
} catch (MalformedURLException e) {
return false;
}
diff --git a/core/java/src/net/i2p/crypto/TrustedUpdate.java b/core/java/src/net/i2p/crypto/TrustedUpdate.java
index 0b0b35b641..939742d43f 100644
--- a/core/java/src/net/i2p/crypto/TrustedUpdate.java
+++ b/core/java/src/net/i2p/crypto/TrustedUpdate.java
@@ -129,10 +129,10 @@ JXQAnA28vDmMMMH/WPbC5ixmJeGGNUiR
public static final int HEADER_BYTES = Signature.SIGNATURE_BYTES + VERSION_BYTES;
private static final String PROP_TRUSTED_KEYS = "router.trustedUpdateKeys";
- private static I2PAppContext _context;
+ private final I2PAppContext _context;
- private Log _log;
- private Map<SigningPublicKey, String> _trustedKeys;
+ private final Log _log;
+ private final Map<SigningPublicKey, String> _trustedKeys;
private String _newVersion;
/** 172 */
private static final int KEYSIZE_B64_BYTES = 2 + (SigningPublicKey.KEYSIZE_BYTES * 4 / 3);
@@ -155,7 +155,6 @@ JXQAnA28vDmMMMH/WPbC5ixmJeGGNUiR
_context = context;
_log = _context.logManager().getLog(TrustedUpdate.class);
_trustedKeys = new HashMap(4);
- _newVersion = null;
String propertyTrustedKeys = context.getProperty(PROP_TRUSTED_KEYS);
@@ -273,9 +272,9 @@ JXQAnA28vDmMMMH/WPbC5ixmJeGGNUiR
private static final boolean genKeysCLI(String publicKeyFile, String privateKeyFile) {
FileOutputStream fileOutputStream = null;
- _context = I2PAppContext.getGlobalContext();
+ I2PAppContext context = I2PAppContext.getGlobalContext();
try {
- Object signingKeypair[] = _context.keyGenerator().generateSigningKeypair();
+ Object signingKeypair[] = context.keyGenerator().generateSigningKeypair();
SigningPublicKey signingPublicKey = (SigningPublicKey) signingKeypair[0];
SigningPrivateKey signingPrivateKey = (SigningPrivateKey) signingKeypair[1];
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
index bd7c62fdeb..98ed326868 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KBucketImpl.java
@@ -379,7 +379,7 @@ class KBucketImpl implements KBucket {
}
private static void testRand() {
- StringBuilder buf = new StringBuilder(2048);
+ //StringBuilder buf = new StringBuilder(2048);
int low = 1;
int high = 3;
Log log = I2PAppContext.getGlobalContext().logManager().getLog(KBucketImpl.class);
--
GitLab