Skip to content

Commit c9b4fda

Browse files
authored
fix null pointer on project.url (#28)
1 parent 7ab43a4 commit c9b4fda

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kotlin-jira-client/kotlin-jira-client-sdk/src/main/kotlin/com/linkedplanet/kotlinjiraclient/sdk/SdkJiraProjectOperator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object SdkJiraProjectOperator : JiraProjectOperator {
4747
eitherAndCatch {
4848
projectService.getProjectById(user(), projectId.toLong()).toEither().bind().get().let {
4949
val avatarUrl = avatarService.getProjectAvatarAbsoluteURL(it, Avatar.Size.defaultSize())
50-
val url = it.url.ifEmpty { "${baseUrl()}/rest/api/2/project/${it.id}" }
50+
val url = if (!it.url.isNullOrEmpty()) it.url else "${baseUrl()}/rest/api/2/project/${it.id}"
5151
JiraProject(it.id, it.key, it.name, url, avatarUrl.toASCIIString())
5252
}
5353
}
@@ -56,7 +56,7 @@ object SdkJiraProjectOperator : JiraProjectOperator {
5656
eitherAndCatch {
5757
return Either.Right(projectService.getAllProjects(user()).toEither().bind().get().map {
5858
val avatarUrl = avatarService.getProjectAvatarAbsoluteURL(it, Avatar.Size.defaultSize())
59-
val url = it.url.ifEmpty { "${baseUrl()}/rest/api/2/project/${it.id}" }
59+
val url = if (!it.url.isNullOrEmpty()) it.url else "${baseUrl()}/rest/api/2/project/${it.id}"
6060
JiraProject(it.id, it.key, it.name, url, avatarUrl.toASCIIString())
6161
})
6262
}

0 commit comments

Comments
 (0)