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

* findbugs: mostly stream closure fixes in router, apps, core

Browse Source
This commit is contained in:
dg2-new
2014-04-21 10:54:52 +00:00
parent b9491b269b
commit b84682fdc9
13 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
View File

@ -81,7 +81,7 @@ public class SAMStreamSend {
public void streamClosedReceived(String result, int id, String message) {
Sender sender = null;
synchronized (_remotePeers) {
sender = _remotePeers.remove(new Integer(id));
sender = _remotePeers.remove(Integer.valueOf(id));
}
if (sender != null) {
sender.closed();
@ -171,7 +171,7 @@ public class SAMStreamSend {
_remoteDestination = new String(dest, 0, read);
synchronized (_remotePeers) {
_connectionId = _remotePeers.size() + 1;
_remotePeers.put(new Integer(_connectionId), Sender.this);
_remotePeers.put(Integer.valueOf(_connectionId), Sender.this);
}
_context.statManager().createRateStat("send." + _connectionId + ".totalSent", "Data size sent", "swarm", new long[] { 30*1000, 60*1000, 5*60*1000 });

14
apps/sam/java/src/net/i2p/sam/client/SAMStreamSink.java
View File

@ -83,7 +83,7 @@ public class SAMStreamSink {
public void streamClosedReceived(String result, int id, String message) {
Sink sink = null;
synchronized (_remotePeers) {
sink = _remotePeers.remove(new Integer(id));
sink = _remotePeers.remove(Integer.valueOf(id));
}
if (sink != null) {
sink.closed();
@ -96,7 +96,7 @@ public class SAMStreamSink {
public void streamDataReceived(int id, byte data[], int offset, int length) {
Sink sink = null;
synchronized (_remotePeers) {
sink = _remotePeers.get(new Integer(id));
sink = _remotePeers.get(Integer.valueOf(id));
}
if (sink != null) {
sink.received(data, offset, length);
@ -111,7 +111,7 @@ public class SAMStreamSink {
try {
Sink sink = new Sink(id, dest);
synchronized (_remotePeers) {
_remotePeers.put(new Integer(id), sink);
_remotePeers.put(Integer.valueOf(id), sink);
}
} catch (IOException ioe) {
_log.error("Error creating a new sink", ioe);
@ -169,15 +169,17 @@ public class SAMStreamSink {
}
private boolean writeDest(String dest) {
FileOutputStream fos = null;
try {
FileOutputStream fos = new FileOutputStream(_destFile);
fos = new FileOutputStream(_destFile);
fos.write(dest.getBytes());
fos.close();
return true;
} catch (Exception e) {
_log.error("Error writing to " + _destFile, e);
return false;
} finally {
if(fos != null) try { fos.close(); } catch(IOException ioe) {}
}
return true;
}
private class Sink {