[tor-commits] [metrics-lib/master] Allow multiple "m" lines per network status entry.

[karsten at torproject.org]

commit 66cec8b01fced75a79d3cf202f4d2eba01091455
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Sep 5 04:16:41 2012 -0400

    Allow multiple "m" lines per network status entry.
---
 .../descriptor/impl/NetworkStatusEntryImpl.java    |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java
index 423e21e..121f66e 100644
--- a/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java
+++ b/src/org/torproject/descriptor/impl/NetworkStatusEntryImpl.java
@@ -43,7 +43,6 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry {
     this.atMostOnceKeywords.add("v");
     this.atMostOnceKeywords.add("w");
     this.atMostOnceKeywords.add("p");
-    this.atMostOnceKeywords.add("m");
   }
 
   private void parsedAtMostOnceKeyword(String keyword)
@@ -192,9 +191,8 @@ public class NetworkStatusEntryImpl implements NetworkStatusEntry {
 
   private void parseMLine(String line, String[] parts)
       throws DescriptorParseException {
-    this.parsedAtMostOnceKeyword("m");
-    /* TODO Implement parsing of m lines in votes.  Try to find where m
-     * lines are specified first. */
+    /* TODO Implement parsing of m lines in votes as specified in
+     * dir-spec.txt. */
   }
 
   private String nickname;