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

propagate from branch 'i2p.i2p' (head cbfe85d22c4d0b05c901db3fa751b57889d9b2d6)

Browse Source 
to branch 'i2p.i2p.str4d.cleanup' (head 94fe1764f50b459da18222434034ad46d604c7a1)
This commit is contained in:
str4d
2013-11-28 11:12:41 +00:00
parent ed2feb3ff7 707f616498
commit f112baac48
22 changed files with 35 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/src/com/nettgryppa/security/HashCash.java
View File

@ -338,7 +338,7 @@ private static long bytesToLong(byte[] b) {
boolean first = true;
for(Map.Entry<String, List<String>> entry: extensions.entrySet()) {
String key = entry.getKey();
String key = entry.getKey();
if(key.contains(":") || key.contains(";") || key.contains("="))
throw new IllegalArgumentException("Extension key contains an illegal character. " + key);
if(!first)

4
core/java/src/net/i2p/client/I2PSessionImpl2.java
View File

@ -523,10 +523,8 @@ class I2PSessionImpl2 extends I2PSessionImpl {
if (_sendingStates == null) // only null if overridden by I2PSimpleSession
return;
synchronized (_sendingStates) {
for (Iterator<MessageState> iter = _sendingStates.iterator(); iter.hasNext();) {
MessageState state = iter.next();
for (MessageState state : _sendingStates)
state.cancel();
}
if (_log.shouldLog(Log.INFO)) _log.info(getPrefix() + "Disconnecting " + _sendingStates.size() + " states");
_sendingStates.clear();
}

7
core/java/src/net/i2p/client/MessageState.java
View File

@ -1,7 +1,6 @@
package net.i2p.client;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.atomic.AtomicLong;
@ -150,8 +149,7 @@ class MessageState {
if (_log.shouldLog(Log.DEBUG))
_log.debug(_prefix + "isSuccess(" + wantedStatus + "): " + _receivedStatus);
for (Iterator<Integer> iter = _receivedStatus.iterator(); iter.hasNext();) {
Integer val = iter.next();
for (Integer val : _receivedStatus) {
int recv = val.intValue();
switch (recv) {
case MessageStatusMessage.STATUS_SEND_BEST_EFFORT_FAILURE:
@ -210,8 +208,7 @@ class MessageState {
if (_log.shouldLog(Log.DEBUG))
_log.debug(_prefix + "isFailure(" + wantedStatus + "): " + _receivedStatus);
for (Iterator<Integer> iter = _receivedStatus.iterator(); iter.hasNext();) {
Integer val = iter.next();
for (Integer val : _receivedStatus) {
int recv = val.intValue();
switch (recv) {
case MessageStatusMessage.STATUS_SEND_BEST_EFFORT_FAILURE:

4
core/java/src/net/i2p/crypto/ElGamalAESEngine.java
View File

@ -12,7 +12,6 @@ package net.i2p.crypto;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@ -656,8 +655,7 @@ public class ElGamalAESEngine {
int cur = prefixBytes;
DataHelper.toLong(aesData, cur, 2, tagsForDelivery.size());
cur += 2;
for (Iterator<SessionTag> iter = tagsForDelivery.iterator(); iter.hasNext();) {
SessionTag tag = iter.next();
for (SessionTag tag : tagsForDelivery) {
System.arraycopy(tag.getData(), 0, aesData, cur, SessionTag.BYTE_LENGTH);
cur += SessionTag.BYTE_LENGTH;
}

4
core/java/src/net/i2p/crypto/KeyStoreUtil.java
View File

@ -266,7 +266,7 @@ public class KeyStoreUtil {
* @param keyPW the key password, must be at least 6 characters
*
* @return success
* @since 0.8.3, consolidated from RouterConsoleRUnner and SSLClientListenerRunner in 0.9.9
* @since 0.8.3, consolidated from RouterConsoleRunner and SSLClientListenerRunner in 0.9.9
*/
public static boolean createKeys(File ks, String alias, String cname, String ou,
String keyPW) {
@ -290,7 +290,7 @@ public class KeyStoreUtil {
* @param keyPW the key password, must be at least 6 characters
*
* @return success
* @since 0.8.3, consolidated from RouterConsoleRUnner and SSLClientListenerRunner in 0.9.9
* @since 0.8.3, consolidated from RouterConsoleRunner and SSLClientListenerRunner in 0.9.9
*/
public static boolean createKeys(File ks, String ksPW, String alias, String cname, String ou,
int validDays, String keyAlg, int keySize, String keyPW) {

9
core/java/src/net/i2p/data/LeaseSet.java
View File

@ -15,7 +15,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import net.i2p.I2PAppContext;
@ -290,10 +289,8 @@ public class LeaseSet extends DatabaseEntry {
_signingKey.writeBytes(out);
DataHelper.writeLong(out, 1, _leases.size());
//DataHelper.writeLong(out, 4, _version);
for (Iterator<Lease> iter = _leases.iterator(); iter.hasNext();) {
Lease lease = iter.next();
for (Lease lease : _leases)
lease.writeBytes(out);
}
} catch (IOException ioe) {
return null;
} catch (DataFormatException dfe) {
@ -339,10 +336,8 @@ public class LeaseSet extends DatabaseEntry {
_signingKey.writeBytes(out);
DataHelper.writeLong(out, 1, _leases.size());
//DataHelper.writeLong(out, 4, _version);
for (Iterator<Lease> iter = _leases.iterator(); iter.hasNext();) {
Lease lease = iter.next();
for (Lease lease : _leases)
lease.writeBytes(out);
}
_signature.writeBytes(out);
}

5
core/java/src/net/i2p/util/I2PAppThread.java
View File

@ -10,7 +10,6 @@ package net.i2p.util;
*/
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@ -45,10 +44,8 @@ public class I2PAppThread extends I2PThread {
@Override
protected void fireOOM(OutOfMemoryError oom) {
for (Iterator<OOMEventListener> iter = _threadListeners.iterator(); iter.hasNext(); ) {
OOMEventListener listener = iter.next();
for (OOMEventListener listener : _threadListeners)
listener.outOfMemory(oom);
}
}
/** register a new component that wants notification of OOM events */

5
core/java/src/net/i2p/util/I2PThread.java
View File

@ -10,7 +10,6 @@ package net.i2p.util;
*/
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
@ -112,10 +111,8 @@ public class I2PThread extends Thread {
****/
protected void fireOOM(OutOfMemoryError oom) {
for (Iterator<OOMEventListener> iter = _listeners.iterator(); iter.hasNext(); ) {
OOMEventListener listener = iter.next();
for (OOMEventListener listener : _listeners)
listener.outOfMemory(oom);
}
}
/** register a new component that wants notification of OOM events */