Commit b1077620 authored by Karsten Loesing's avatar Karsten Loesing
Browse files

Make two fixes to recently added version_status field. 

 - Fix NullPointerException in cases where a relay/bridge does not
   report to have a (valid) tor version.
 - Set version_status field in bridge details documents, too.
parent 520c1577

src/main/java/org/torproject/onionoo/updater/NodeDetailsStatusUpdater.java

+4 −1
Original line number Diff line number Diff line
@@ -919,7 +919,10 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, 
      detailsStatus.setLastChangedOrAddressOrPort(

          nodeStatus.getLastChangedOrAddressOrPort());

      detailsStatus.setVersion(nodeStatus.getVersion());

      detailsStatus.setVersionStatus(nodeStatus.getVersionStatus().toString());

      if (null != nodeStatus.getVersionStatus()) {

        detailsStatus.setVersionStatus(nodeStatus.getVersionStatus()

            .toString());

      }



      this.documentStore.store(detailsStatus, fingerprint);

      this.documentStore.store(nodeStatus, fingerprint);

src/main/java/org/torproject/onionoo/writer/DetailsDocumentWriter.java

+1 −0
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ public class DetailsDocumentWriter implements DocumentWriter { 
    detailsDocument.setPlatform(detailsStatus.getPlatform());

    detailsDocument.setTransports(detailsStatus.getTransports());

    detailsDocument.setVersion(detailsStatus.getVersion());

    detailsDocument.setVersionStatus(detailsStatus.getVersionStatus());

    this.documentStore.store(detailsDocument, fingerprint);

  }