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

Data: Disallow duplicate keys in a Mapping

Browse Source
This commit is contained in:
zzz
2014-11-28 13:45:33 +00:00
parent 449ce3176e
commit 6d6f7fb89b
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/java/src/net/i2p/data/DataHelper.java
View File

@ -108,6 +108,9 @@ public class DataHelper {
* for the value. Finally after that comes the literal UTF-8 character ';'. This key=value; * for the value. Finally after that comes the literal UTF-8 character ';'. This key=value;
* is repeated until there are no more bytes (not characters!) left as defined by the * is repeated until there are no more bytes (not characters!) left as defined by the
* first two byte integer. * first two byte integer.
*
* As of 0.9.18, throws DataFormatException on duplicate key
*
* @param rawStream stream to read the mapping from * @param rawStream stream to read the mapping from
* @throws DataFormatException if the format is invalid * @throws DataFormatException if the format is invalid
* @throws IOException if there is a problem reading the data * @throws IOException if there is a problem reading the data
@ -122,7 +125,14 @@ public class DataHelper {
/** /**
* Ditto, load into an existing properties * Ditto, load into an existing properties
*
* As of 0.9.18, throws DataFormatException on duplicate key
*
* @param props the Properties to load into * @param props the Properties to load into
* @param rawStream stream to read the mapping from
* @throws DataFormatException if the format is invalid
* @throws IOException if there is a problem reading the data
* @return the parameter props
* @since 0.8.13 * @since 0.8.13
*/ */
public static Properties readProperties(InputStream rawStream, Properties props) public static Properties readProperties(InputStream rawStream, Properties props)
@ -148,7 +158,9 @@ public class DataHelper {
if ((read != semiBuf.length) || (!eq(semiBuf, SEMICOLON_BYTES))) { if ((read != semiBuf.length) || (!eq(semiBuf, SEMICOLON_BYTES))) {
throw new DataFormatException("Bad value"); throw new DataFormatException("Bad value");
} }
props.put(key, val); Object old = props.put(key, val);
if (old != null)
throw new DataFormatException("Duplicate key " + key);
} }
return props; return props;
} }
@ -299,6 +311,8 @@ public class DataHelper {
* Warning - confusing method name, Properties is the target. * Warning - confusing method name, Properties is the target.
* Strings must be UTF-8 encoded in the byte array. * Strings must be UTF-8 encoded in the byte array.
* *
* As of 0.9.18, throws DataFormatException on duplicate key
*
* @param source source * @param source source
* @param target returned Properties * @param target returned Properties
* @return new offset * @return new offset
@ -333,7 +347,9 @@ public class DataHelper {
} catch (IOException ioe) { } catch (IOException ioe) {
throw new DataFormatException("Bad value", ioe); throw new DataFormatException("Bad value", ioe);
} }
target.put(key, val); Object old= target.put(key, val);
if (old != null)
throw new DataFormatException("Duplicate key " + key);
} }
return offset + size; return offset + size;
} }
@ -398,6 +414,9 @@ public class DataHelper {
* - '=' is the only key-termination character (not ':' or whitespace) * - '=' is the only key-termination character (not ':' or whitespace)
* *
* As of 0.9.10, an empty value is allowed. * As of 0.9.10, an empty value is allowed.
*
* As in Java Properties, duplicate keys are allowed, last one wins.
*
*/ */
public static void loadProps(Properties props, File file) throws IOException { public static void loadProps(Properties props, File file) throws IOException {
loadProps(props, file, false); loadProps(props, file, false);