From b3d7f5469fbc82a12db07fa728a3cd1d298d9fca Mon Sep 17 00:00:00 2001 From: jeb228 Date: Tue, 9 Nov 2010 18:12:53 +0000 Subject: [PATCH] Fix problem with revisionInfo: fails badly for a developer with turtle SVN -- change it to fail gracefully. --- .../vitro/utilities/revisioninfo/InfoResponseParser.java | 3 ++- .../vitro/utilities/revisioninfo/RevisionInfoBuilder.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) 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 87e5283c6..539df474f 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 @@ -25,7 +25,8 @@ public class InfoResponseParser { public InfoResponseParser(String infoResponse) { this.infoResponse = infoResponse; System.err.println("response from svn info: '" - + infoResponse.replace("\n", "\\n") + "'"); + + ((infoResponse == null) ? null : infoResponse.replace("\n", + "\\n")) + "'"); } public String parse() { 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 d2ef94976..58035f441 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 @@ -137,7 +137,7 @@ public class RevisionInfoBuilder { } private String buildDummyInfo() { - return buildLine("unknown", "unknown"); + return buildLine(null, null); } private String buildLine(String release, String revision) {