From 4553694c773980a57efa63f8bc0adda58fc45ac5 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 27 Oct 2010 14:57:10 +0000 Subject: [PATCH] NIHVIVO-1229 Restore debug statements in the RevisionInfoBuilder. Guard against nulls in revision level or release label. --- .../vitro/utilities/revisioninfo/InfoResponseParser.java | 3 +++ .../vitro/utilities/revisioninfo/RevisionInfoBuilder.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java b/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java index d4a4459d4..ccaa8e57f 100644 --- a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java +++ b/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java @@ -29,6 +29,7 @@ public class InfoResponseParser { public String parse() { try { path = figurePath(); + System.err.println("path=" + path); // TODO if (isTrunkPath()) { return "trunk"; @@ -52,6 +53,8 @@ public class InfoResponseParser { String url = getUrlFromResponse(); String root = getRootFromResponse(); + System.err.println("url=" + url); // TODO + System.err.println("root=" + root); // TODO if (!url.startsWith(root)) { throw new Exception("url doesn't start with root."); diff --git a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java b/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java index 82214a5b8..d2ef94976 100644 --- a/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java +++ b/utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java @@ -71,6 +71,8 @@ public class RevisionInfoBuilder { String release = assembleReleaseNameFromSubversion(); String revision = obtainRevisionLevelFromSubversion(); + System.err.println("release=" + release); // TODO + System.err.println("revision=" + revision); // TODO return buildLine(release, revision); } @@ -139,6 +141,12 @@ public class RevisionInfoBuilder { } private String buildLine(String release, String revision) { + if (release == null) { + release = "unknown"; + } + if (revision == null) { + revision = "unknown"; + } return productName + INFO_LINE_DELIMITER + release.trim() + INFO_LINE_DELIMITER + revision.trim(); }