Merge branch 'stable-3.5' into master
* stable-3.5:
Set version 3.5.0.2
Set version to 3.4.0-rc1
Fix issue with importing PR without description
Change-Id: I5284d485ca170d2e51ab59985b9f3f45af2b0db2
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
index f536c70..e47f161 100644
--- 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 @@
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()));
diff --git a/pom.xml b/pom.xml
index 72d4915..106f4c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.googlesource.gerrit.plugins.github</groupId>
<artifactId>github-parent</artifactId>
- <version>3.5.0.1</version>
+ <version>3.5.0.2</version>
<name>Gerrit Code Review - GitHub integration</name>
<url>http://www.gerritforge.com</url>
<packaging>pom</packaging>
