commit 316e956bc05b5805b387ae75076233f76f69c8ae Author: Karsten Loesing karsten.loesing@gmx.net Date: Sat May 19 10:14:54 2012 +0200

Ignore unknown keywords in "w" lines.

moria1 added a Capped= keyword to debug #2286 which made DocTor and metrics-db freak out. The correct behavior is to ignore unknown keywords. --- .../descriptor/impl/NetworkStatusEntryImpl.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java index 152b1f4..108d563 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java @@ -162,8 +162,7 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry { this.measured = pairs.remove("Measured"); } if (!pairs.isEmpty()) { - throw new DescriptorParseException("Unknown key-value pair in " - + "line '" + line + "'."); + /* Ignore unknown key-value pair. */ } }