Merge branch 'private-release/v1.1.0-221' into private-release/v1.1.0…

…-223
zowe · Aug 18, 2023 · 51d3e08 · 51d3e08
2 parents 627e64d + c9e5d8e
commit 51d3e08
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/kotlin/eu/ibagroup/formainframe/api/ZosmfApiImpl.kt b/src/main/kotlin/eu/ibagroup/formainframe/api/ZosmfApiImpl.kt
@@ -76,14 +76,15 @@ class ZosmfApiImpl : ZosmfApi {
     useBytesConverter: Boolean
   ): Api {
     val zosmfUrl = ZosmfUrl(url, isAllowSelfSigned)
+    val defaultApi = Pair<MutableMap<ZosmfUrl, Any>, MutableMap<ZosmfUrl, Any>>(hashMapOf(), hashMapOf())
     if (!apis.containsKey(apiClass)) {
       synchronized(apis) {
         if (!apis.containsKey(apiClass)) {
-          apis[apiClass] = Pair(hashMapOf(), hashMapOf())
+          apis[apiClass] = defaultApi
         }
       }
     }
-    val apiClassMap = apis[apiClass]!!
+    val apiClassMap = apis[apiClass] ?: defaultApi
     synchronized(apiClassMap) {
       if (!useBytesConverter && !apiClassMap.first.containsKey(zosmfUrl)) {
         apiClassMap.first[zosmfUrl] = buildApi(zosmfUrl.url, getOkHttpClient(zosmfUrl.isAllowSelfSigned), apiClass)
@@ -94,7 +95,6 @@ class ZosmfApiImpl : ZosmfApi {
     }
     return if (!useBytesConverter) apiClassMap.first[zosmfUrl] as Api else apiClassMap.second[zosmfUrl] as Api
   }
-
 }
 
 private val gsonFactory = GsonConverterFactory.create(GsonBuilder().create())