merge of '2bb222d33ec817b78fcf506c32da44d10b1eff3b'

and '59e86e3176465259a67927b042c1307cd0a94aa4'
This commit is contained in:
zzz
2013-10-14 17:10:55 +00:00
9 changed files with 74 additions and 63 deletions

View File

@@ -44,7 +44,7 @@ public interface DHT {
* @param max maximum number of peers to return
* @param maxWait the maximum time to wait (ms) must be > 0
* @param annMax the number of peers to announce to
* @param maxWait the maximum total time to wait for announces, may be 0 to return immediately without waiting for acks
* @param annMaxWait the maximum total time to wait for announces, may be 0 to return immediately without waiting for acks
* @return possibly empty (never null)
*/
public Collection<Hash> getPeersAndAnnounce(byte[] ih, int max, long maxWait, int annMax, long annMaxWait);

View File

@@ -317,7 +317,7 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
* @param max maximum number of peers to return
* @param maxWait the maximum time to wait (ms) must be > 0
* @param annMax the number of peers to announce to
* @param maxWait the maximum total time to wait for announces, may be 0 to return immediately without waiting for acks
* @param annMaxWait the maximum total time to wait for announces, may be 0 to return immediately without waiting for acks
* @return possibly empty (never null)
*/
public Collection<Hash> getPeersAndAnnounce(byte[] ih, int max, long maxWait, int annMax, long annMaxWait) {