fix: null safety in getDockerPlatform improved (#466)

NicoKandut · web-flow · commit bc425f9e7b43 · 2024-11-18T09:40:23.000Z
diff --git a/src/main/groovy/com/avast/gradle/dockercompose/DockerExecutor.groovy b/src/main/groovy/com/avast/gradle/dockercompose/DockerExecutor.groovy
@@ -48,7 +48,7 @@ class DockerExecutor {
 
     String getDockerPlatform() {
         String osType = getDockerInfo().collect { it.trim() }.find { it.startsWith('OSType:') }
-        osType.empty ? System.getProperty("os.name") : osType.substring('OSType:'.length()).trim()
+        osType == null || osType.empty ? System.getProperty("os.name") : osType.substring('OSType:'.length()).trim()
     }
 
     String getContainerPlatform(Map<String, Object> inspection) {

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class DockerExecutor {`
`48`	`48`
`49`	`49`	`String getDockerPlatform() {`
`50`	`50`	`String osType = getDockerInfo().collect { it.trim() }.find { it.startsWith('OSType:') }`
`51`		`- osType.empty ? System.getProperty("os.name") : osType.substring('OSType:'.length()).trim()`
	`51`	`+ osType == null \|\| osType.empty ? System.getProperty("os.name") : osType.substring('OSType:'.length()).trim()`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`String getContainerPlatform(Map<String, Object> inspection) {`