[or-cvs] [metrics-db/master] Fix bridge stats by removing bridges that were relays.

[karsten at torproject.org]

Author: Karsten Loesing <karsten.loesing at gmx.net>
Date: Tue, 27 Jul 2010 15:12:34 +0200
Subject: Fix bridge stats by removing bridges that were relays.
Commit: 9a45fd7876959efc1860fdf1f213b2bff9a50461

Commit bdd30a8b broke the logic to remove bridges that were relays before.
Fixes task 1698.
---
 .../torproject/ernie/db/RelayDescriptorParser.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java
index 70be2f4..885cd7f 100644
--- a/src/org/torproject/ernie/db/RelayDescriptorParser.java
+++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java
@@ -154,7 +154,8 @@ public class RelayDescriptorParser {
             serverDescriptors.add(publishedTime + "," + relayIdentity
                 + "," + serverDesc);
             hashedRelayIdentities.add(DigestUtils.shaHex(
-                Base64.decodeBase64(relayIdentity + "=")).toUpperCase());
+                Base64.decodeBase64(line.split(" ")[2] + "=")).
+                toUpperCase());
             descriptorIdentity = line.split(" ")[3];
           } else if (line.startsWith("s ")) {
             if (line.contains(" Running")) {
-- 
1.7.1