Fix CompoundKey's fromString to decode the components
Since we encoded each component in toString we must also perform
our own decode in fromString, otherwise the values may not decode
correctly as there is an extra level of encoding left in the
input string.
Signed-off-by: Shawn O. Pearce <sop@google.com>
diff --git a/src/main/java/com/google/gwtorm/client/CompoundKey.java b/src/main/java/com/google/gwtorm/client/CompoundKey.java
index 52d2513..f64114a 100644
--- a/src/main/java/com/google/gwtorm/client/CompoundKey.java
+++ b/src/main/java/com/google/gwtorm/client/CompoundKey.java
@@ -95,10 +95,10 @@
final String[] parts = in.split(",");
int p = 0;
if (getParentKey() != null) {
- getParentKey().fromString(parts[p++]);
+ getParentKey().fromString(KeyUtil.decode(parts[p++]));
}
for (final Key<?> k : members()) {
- k.fromString(parts[p++]);
+ k.fromString(KeyUtil.decode(parts[p++]));
}
}
