Merge branch 'stable-3.4' into stable-3.5

maczech · maczech · commit 77bf6c3b4963 · 2022-01-04T09:16:52.000+01:00
* stable-3.4:
  Set version to 3.4.0-rc1
  Fix issue with importing PR without description

Change-Id: I6b2ffb54a3381bc1e8488d185d506b8eca6505e7
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/wizard/PullRequestListController.java
@@ -102,8 +102,8 @@ public void doAction(
           for (GHPullRequest pr : repoEntry.getValue()) {
             JsonObject prObj = new JsonObject();
             prObj.add("id", new JsonPrimitive(new Integer(pr.getNumber())));
-            prObj.add("title", new JsonPrimitive(pr.getTitle()));
-            prObj.add("body", new JsonPrimitive(pr.getBody()));
+            prObj.add("title", new JsonPrimitive(Strings.nullToEmpty(pr.getTitle())));
+            prObj.add("body", new JsonPrimitive(Strings.nullToEmpty(pr.getBody())));
             prObj.add(
                 "author", new JsonPrimitive(pr.getUser() == null ? "" : pr.getUser().getLogin()));
             prObj.add("status", new JsonPrimitive(pr.getState().name()));
