litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1229 Restore debug statements in the RevisionInfoBuilder. Guard against nulls in revision level or release label.

Browse source
This commit is contained in:
jeb228 2010-10-27 14:57:10 +00:00
parent 9b3ac410c2
commit 4553694c77
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/InfoResponseParser.java
View file

@ -29,6 +29,7 @@ public class InfoResponseParser {
public String parse() { public String parse() {
try { try {
path = figurePath(); path = figurePath();
System.err.println("path=" + path); // TODO
if (isTrunkPath()) { if (isTrunkPath()) {
return "trunk"; return "trunk";
@ -52,6 +53,8 @@ public class InfoResponseParser {
String url = getUrlFromResponse(); String url = getUrlFromResponse();
String root = getRootFromResponse(); String root = getRootFromResponse();
System.err.println("url=" + url); // TODO
System.err.println("root=" + root); // TODO
if (!url.startsWith(root)) { if (!url.startsWith(root)) {
throw new Exception("url doesn't start with root."); throw new Exception("url doesn't start with root.");

8
utilities/buildutils/revisioninfo/edu/cornell/mannlib/vitro/utilities/revisioninfo/RevisionInfoBuilder.java
View file

@ -71,6 +71,8 @@ public class RevisionInfoBuilder {
String release = assembleReleaseNameFromSubversion(); String release = assembleReleaseNameFromSubversion();
String revision = obtainRevisionLevelFromSubversion(); String revision = obtainRevisionLevelFromSubversion();
System.err.println("release=" + release); // TODO
System.err.println("revision=" + revision); // TODO
return buildLine(release, revision); return buildLine(release, revision);
} }
@ -139,6 +141,12 @@ public class RevisionInfoBuilder {
} }
private String buildLine(String release, String revision) { private String buildLine(String release, String revision) {
if (release == null) {
release = "unknown";
}
if (revision == null) {
revision = "unknown";
}
return productName + INFO_LINE_DELIMITER + release.trim() return productName + INFO_LINE_DELIMITER + release.trim()
+ INFO_LINE_DELIMITER + revision.trim(); + INFO_LINE_DELIMITER + revision.trim();
} }