Fix npe (#582)

drpcorg · Oct 23, 2024 · d2d722a · d2d722a
1 parent 697db61
commit d2d722a
Showing 1 changed file with 22 additions and 20 deletions.
diff --git a/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericUpstream.kt b/src/main/kotlin/io/emeraldpay/dshackle/upstream/generic/GenericUpstream.kt
@@ -246,26 +246,28 @@ open class GenericUpstream(
     }
 
     private fun detectSettings() {
-        settingsDetectorSubscription.set(
-            Flux.interval(
-                Duration.ZERO,
-                Duration.ofSeconds(getOptions().validationInterval.toLong() * 5),
-            ).flatMap {
-                Flux.merge(
-                    settingsDetector?.detectLabels()
-                        ?.doOnNext { label ->
-                            updateLabels(label)
-                            sendUpstreamStateEvent(UPDATED)
-                        },
-                    settingsDetector?.detectClientVersion()
-                        ?.doOnNext {
-                            log.info("Detected node version $it for upstream ${getId()}")
-                            clientVersion.set(it)
-                        },
-                )
-                    .subscribeOn(settingsScheduler)
-            }.subscribe(),
-        )
+        if (settingsDetector != null) {
+            settingsDetectorSubscription.set(
+                Flux.interval(
+                    Duration.ZERO,
+                    Duration.ofSeconds(getOptions().validationInterval.toLong() * 5),
+                ).flatMap {
+                    Flux.merge(
+                        settingsDetector.detectLabels()
+                            .doOnNext { label ->
+                                updateLabels(label)
+                                sendUpstreamStateEvent(UPDATED)
+                            },
+                        settingsDetector.detectClientVersion()
+                            .doOnNext {
+                                log.info("Detected node version $it for upstream ${getId()}")
+                                clientVersion.set(it)
+                            },
+                    )
+                        .subscribeOn(settingsScheduler)
+                }.subscribe(),
+            )
+        }
     }
 
     private fun detectRpcMethods(