Fix an issue

zhaosongzs · Jul 5, 2024 · 4df832a · 4df832a
1 parent 9156d8b
commit 4df832a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/bots/notify/src/main/java/org/openjdk/skara/bots/notify/PullRequestWorkItem.java b/bots/notify/src/main/java/org/openjdk/skara/bots/notify/PullRequestWorkItem.java
@@ -96,7 +96,7 @@ private Set<PullRequestState> deserializePrState(String current) {
                                null : new Hash(obj.get("commit").asString());
                        var state = obj.get("state").isNull() ?
                                null : org.openjdk.skara.issuetracker.Issue.State.valueOf(obj.get("state").asString());
-                       var targetBranch = obj.get("targetBranch").isNull() ?
+                       var targetBranch = obj.get("targetBranch") == null ?
                                null : obj.get("targetBranch").asString();
 
                        return new PullRequestState(id, issues, commit, new Hash(obj.get("head").asString()), state, targetBranch);
@@ -135,7 +135,9 @@ private String serializePrState(Collection<PullRequestState> added, Set<PullRequ
                                 } else {
                                     ret.putNull("state");
                                 }
-                                ret.put("targetBranch", JSON.of(pr.targetBranch()));
+                                if (pr.targetBranch() != null) {
+                                    ret.put("targetBranch", JSON.of(pr.targetBranch()));
+                                }
                                 return ret;
                             })
                             .map(JSONObject::toString)