I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

parseParams throws exception on bad formatting, and its perfectly valid to have params with 0 values (e.g. DEST GENERATE\n)

Browse Source
This commit is contained in:
jrandom
2004-05-04 01:35:09 +00:00
committed by zzz
parent 5aa680fc93
commit 141902b86d
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
apps/sam/java/src/net/i2p/sam/SAMUtils.java
View File

@ -108,9 +108,10 @@ public class SAMUtils {
* *
* @param tok A StringTokenizer pointing to the SAM parameters * @param tok A StringTokenizer pointing to the SAM parameters
* *
* @return Properties with the parsed SAM params, or null if none is found * @throws SAMException if the data was formatted incorrectly
* @return Properties with the parsed SAM params
*/ */
public static Properties parseParams(StringTokenizer tok) { public static Properties parseParams(StringTokenizer tok) throws SAMException {
int pos, nprops = 0, ntoks = tok.countTokens(); int pos, nprops = 0, ntoks = tok.countTokens();
String token, param, value; String token, param, value;
Properties props = new Properties(); Properties props = new Properties();
@ -121,7 +122,7 @@ public class SAMUtils {
pos = token.indexOf("="); pos = token.indexOf("=");
if (pos == -1) { if (pos == -1) {
_log.debug("Error in params format"); _log.debug("Error in params format");
return null; throw new SAMException("Bad formatting for param [" + token + "]");
} }
param = token.substring(0, pos); param = token.substring(0, pos);
value = token.substring(pos + 1); value = token.substring(pos + 1);
@ -134,11 +135,7 @@ public class SAMUtils {
_log.debug("Parsed properties: " + dumpProperties(props)); _log.debug("Parsed properties: " + dumpProperties(props));
} }
if (nprops != 0) { return props;
return props;
} else {
return null;
}
} }
/* Dump a Properties object in an human-readable form */ /* Dump a Properties object in an human-readable form */

2
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
View File

@ -281,7 +281,7 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
private boolean execDestMessage(String opcode, Properties props) { private boolean execDestMessage(String opcode, Properties props) {
if (opcode.equals("GENERATE")) { if (opcode.equals("GENERATE")) {
if (props != null) { if (props.size() > 0) {
_log.debug("Properties specified in DEST GENERATE message"); _log.debug("Properties specified in DEST GENERATE message");
return false; return false;
} }