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

to branch 'i2p.i2p' (head b977ab50209475c0e74825f361924e05dbd470c7)
This commit is contained in:
zzz
2015-06-17 16:00:53 +00:00
59 changed files with 572 additions and 224 deletions

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
*/