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

Findbugs all over #3

Browse Source 
char encoding, remove FileReader/FileWriter
Fix TunnelConfig bug
This commit is contained in:
zzz
2015-07-12 16:34:24 +00:00
parent 1f9bb046f5
commit d087fd674b
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
View File

@@ -35,7 +35,6 @@ import java.io.ByteArrayOutputStream;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@@ -1605,7 +1604,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
private void runRun(String args[], Logging l) { private void runRun(String args[], Logging l) {
if (args.length == 1) { if (args.length == 1) {
try { try {
BufferedReader br = new BufferedReader(new FileReader(args[0])); BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(args[0]), "UTF-8"));
String line; String line;
while ((line = br.readLine()) != null) { while ((line = br.readLine()) != null) {
runCommand(line, l); runCommand(line, l);

5
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2Ping.java
View File

@@ -4,8 +4,9 @@
package net.i2p.i2ptunnel; package net.i2p.i2ptunnel;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.net.Socket; import java.net.Socket;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -157,7 +158,7 @@ public class I2Ping extends I2PTunnelClientBase {
} }
if (hostListFile != null) { if (hostListFile != null) {
BufferedReader br = new BufferedReader(new FileReader(hostListFile)); BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(hostListFile), "UTF-8"));
String line; String line;
List<PingHandler> pingHandlers = new ArrayList<PingHandler>(); List<PingHandler> pingHandlers = new ArrayList<PingHandler>();
int i = 0; int i = 0;

2
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java
View File

@@ -319,7 +319,7 @@ public class TunnelConfig {
if (val) if (val)
_booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT); _booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT);
else else
_booleanOptions.add(I2PTunnelHTTPClient.PROP_ACCEPT); _booleanOptions.remove(I2PTunnelHTTPClient.PROP_ACCEPT);
} }
public void setAllowInternalSSL(boolean val) { public void setAllowInternalSSL(boolean val) {
if (val) if (val)

8
apps/susidns/src/java/src/i2p/susi/dns/SubscriptionsBean.java
View File

@@ -27,9 +27,11 @@ package i2p.susi.dns;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -71,7 +73,7 @@ public class SubscriptionsBean extends BaseBean
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
BufferedReader br = null; BufferedReader br = null;
try { try {
br = new BufferedReader( new FileReader( file ) ); br = new BufferedReader(new InputStreamReader(new FileInputStream(file), "UTF-8"));
String line; String line;
while( ( line = br.readLine() ) != null ) { while( ( line = br.readLine() ) != null ) {
buf.append( line ); buf.append( line );
@@ -108,7 +110,7 @@ public class SubscriptionsBean extends BaseBean
urls.add(line); urls.add(line);
} }
Collections.sort(urls); Collections.sort(urls);
PrintWriter out = new PrintWriter( new SecureFileOutputStream( file ) ); PrintWriter out = new PrintWriter(new OutputStreamWriter(new SecureFileOutputStream(file), "UTF-8"));
for (String url : urls) { for (String url : urls) {
out.println(url); out.println(url);
} }

3
core/java/src/net/i2p/crypto/CertUtil.java
View File

@@ -3,6 +3,7 @@ package net.i2p.crypto;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.security.cert.Certificate; import java.security.cert.Certificate;
import java.security.cert.CertificateEncodingException; import java.security.cert.CertificateEncodingException;
@@ -45,7 +46,7 @@ public class CertUtil {
// Get the encoded form which is suitable for exporting // Get the encoded form which is suitable for exporting
byte[] buf = cert.getEncoded(); byte[] buf = cert.getEncoded();
os = new SecureFileOutputStream(file); os = new SecureFileOutputStream(file);
wr = new PrintWriter(os); wr = new PrintWriter(new OutputStreamWriter(os, "UTF-8"));
wr.println("-----BEGIN CERTIFICATE-----"); wr.println("-----BEGIN CERTIFICATE-----");
String b64 = Base64.encode(buf, true); // true = use standard alphabet String b64 = Base64.encode(buf, true); // true = use standard alphabet
for (int i = 0; i < b64.length(); i += LINE_LENGTH) { for (int i = 0; i < b64.length(); i += LINE_LENGTH) {

5
core/java/src/net/i2p/stat/BufferedStatLog.java
View File

@@ -2,8 +2,9 @@ package net.i2p.stat;
import java.io.BufferedWriter; import java.io.BufferedWriter;
import java.io.File; import java.io.File;
import java.io.FileWriter; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStreamWriter;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
@@ -115,7 +116,7 @@ public class BufferedStatLog implements StatLog {
if (_out != null) try { _out.close(); } catch (IOException ioe) {} if (_out != null) try { _out.close(); } catch (IOException ioe) {}
_outFile = filename; _outFile = filename;
try { try {
_out = new BufferedWriter(new FileWriter(_outFile, true), 32*1024); _out = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(_outFile, true), "UTF-8"), 32*1024);
} catch (IOException ioe) { ioe.printStackTrace(); } } catch (IOException ioe) { ioe.printStackTrace(); }
} }
} }