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

propagate from branch 'i2p.i2p.zzz.multisess' (head 655a0c2bbd50625c804b8de8c809b40ed63f53f4)

Browse Source 
to branch 'i2p.i2p' (head b977ab50209475c0e74825f361924e05dbd470c7)
This commit is contained in:
zzz
2015-06-17 16:00:53 +00:00
parent 036b77746b 627f7076b0
commit 8096e4f65d
59 changed files with 572 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
View File

@@ -1738,7 +1738,7 @@ public class SnarkManager implements CompleteListener {
int totalDeleted = 0;
synchronized (_snarks) {
for (Snark snark : _snarks.values()) {
torrents.add(new SHA1Hash(snark.getMetaInfo().getInfoHash()));
torrents.add(new SHA1Hash(snark.getInfoHash()));
}
synchronized (_configLock) {
for (int i = 0; i < B64.length(); i++) {

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcInboundFilter.java
View File

@@ -47,8 +47,8 @@ public class IrcInboundFilter implements Runnable {
in = new BufferedReader(new InputStreamReader(remote.getInputStream(), "ISO-8859-1"));
output=local.getOutputStream();
} catch (IOException e) {
if (_log.shouldLog(Log.ERROR))
_log.error("IrcInboundFilter: no streams",e);
if (_log.shouldLog(Log.WARN))
_log.warn("IrcInboundFilter: no streams",e);
return;
}
if (_log.shouldLog(Log.DEBUG))

4
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IrcOutboundFilter.java
View File

@@ -47,8 +47,8 @@ public class IrcOutboundFilter implements Runnable {
in = new BufferedReader(new InputStreamReader(local.getInputStream(), "ISO-8859-1"));
output=remote.getOutputStream();
} catch (IOException e) {
if (_log.shouldLog(Log.ERROR))
_log.error("IrcOutboundFilter: no streams",e);
if (_log.shouldLog(Log.WARN))
_log.warn("IrcOutboundFilter: no streams",e);
return;
}
if (_log.shouldLog(Log.DEBUG))

24
apps/routerconsole/java/src/net/i2p/router/update/ConsoleUpdateManager.java
View File

@@ -275,7 +275,27 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
public String getStatus() {
return _status;
}
/**
* Is an update available?
* Blocking.
* An available update may still have a constraint or lack sources.
* @param type the UpdateType of this request
* @return new version or null if nothing newer is available
* @since 0.9.21
*/
public String checkAvailable(UpdateType type) {
return checkAvailable(type, "", DEFAULT_CHECK_TIME);
}
/**
* Is an update available?
* Blocking.
* An available update may still have a constraint or lack sources.
* @param type the UpdateType of this request
* @param maxWait max time to block
* @return new version or null if nothing newer is available
*/
public String checkAvailable(UpdateType type, long maxWait) {
return checkAvailable(type, "", maxWait);
}
@@ -284,6 +304,8 @@ public class ConsoleUpdateManager implements UpdateManager, RouterApp {
* Is an update available?
* Blocking.
* An available update may still have a constraint or lack sources.
* @param type the UpdateType of this request
* @param id id of this request
* @param maxWait max time to block
* @return new version or null if nothing newer is available
*/