ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-29 15:43:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1544 from corda/m4ksio_gradle_no_o_fix

Browse Source 
Avoid ArrayOutOfBound exception in Gradle
This commit is contained in:
Maksymilian Pawlak 2017-10-23 13:24:31 +01:00 committed by GitHub
commit 931ab120fc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gradle-plugins/cordformation/src/main/kotlin/net/corda/plugins/Node.kt
View File

@ -3,6 +3,7 @@ package net.corda.plugins
import com.typesafe.config.* import com.typesafe.config.*
import net.corda.cordform.CordformNode import net.corda.cordform.CordformNode
import org.bouncycastle.asn1.x500.X500Name import org.bouncycastle.asn1.x500.X500Name
import org.bouncycastle.asn1.x500.RDN
import org.bouncycastle.asn1.x500.style.BCStyle import org.bouncycastle.asn1.x500.style.BCStyle
import org.gradle.api.Project import org.gradle.api.Project
import java.io.File import java.io.File
@ -117,7 +118,12 @@ class Node(private val project: Project) : CordformNode() {
} }
val dirName = try { val dirName = try {
X500Name(name).getRDNs(BCStyle.O).first().first.value.toString() val o = X500Name(name).getRDNs(BCStyle.O)
if (o.size > 0) {
o.first().first.value.toString()
} else {
name
}
} catch(_ : IllegalArgumentException) { } catch(_ : IllegalArgumentException) {
// Can't parse as an X500 name, use the full string // Can't parse as an X500 name, use the full string
name name