From 1c1b2996c386792fc9c7dbaefa1143b3665a1f8b Mon Sep 17 00:00:00 2001 From: hudeng Date: Sat, 28 Nov 2020 23:34:54 +0800 Subject: [PATCH] fix: gerrit project information output parse error --- .../gerrit/downloaders/ssh/SshDownloader.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/GerritDownloader/src/main/java/com/holmsted/gerrit/downloaders/ssh/SshDownloader.java b/GerritDownloader/src/main/java/com/holmsted/gerrit/downloaders/ssh/SshDownloader.java index 628ece4..d412989 100644 --- a/GerritDownloader/src/main/java/com/holmsted/gerrit/downloaders/ssh/SshDownloader.java +++ b/GerritDownloader/src/main/java/com/holmsted/gerrit/downloaders/ssh/SshDownloader.java @@ -30,18 +30,14 @@ static class QueryMetadata { static QueryMetadata fromOutputString(String output) { JSONObject lastLineData = JsonUtils.readJsonString(output); - if (lastLineData.get("rowCount") != null) { - return new QueryMetadata(lastLineData); - } else { - return null; - } + return new QueryMetadata(lastLineData); } private QueryMetadata(JSONObject metadata) { - moreChanges = metadata.optBoolean("moreChanges"); - rowCount = metadata.optInt("rowCount"); - runtimeMsec = metadata.optInt("runTimeMilliseconds"); - resumeSortkey = metadata.optString("resumeSortKey"); + moreChanges = metadata.has("moreChanges")?metadata.optBoolean("moreChanges"):false; + rowCount = metadata.has("rowCount")?metadata.optInt("rowCount"):0; + runtimeMsec = metadata.has("runTimeMilliseconds")?metadata.optInt("runTimeMilliseconds"):0; + resumeSortkey = metadata.has("resumSortKey")?metadata.optString("resumeSortKey"):""; } }