Merge pull request #68 from mikkopiu/master

BitbucketClient: prevent NPE when comment is deleted
mibexsoftware · Dec 15, 2017 · f60cbea · f60cbea
2 parents 0a2b07f + 6ae0f65
commit f60cbea
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/scala/ch/mibex/bitbucket/sonar/client/BitbucketClient.scala b/src/main/scala/ch/mibex/bitbucket/sonar/client/BitbucketClient.scala
@@ -144,7 +144,8 @@ class BitbucketClient(config: SonarBBPluginConfig) {
   def findOwnPullRequestComments(pullRequest: PullRequest): Seq[PullRequestComment] = {
 
     def isFromUs(comment: Map[String, Any]): Boolean =
-      comment("user").asInstanceOf[Map[String, Any]]("uuid").asInstanceOf[String] equals uuid
+      Option(comment("user").asInstanceOf[Map[String, Any]])
+        .getOrElse(Map("uuid" -> ""))("uuid").asInstanceOf[String] equals uuid
 
     def fetchPullRequestCommentsPage(start: Int): (Option[Int], Seq[PullRequestComment]) = {
       fetchPage(s"/pullrequests/${pullRequest.id}/comments", f =