Resolving conflict and adaptation to other merge PR 'bug fix running status remain when error occur'

Signed-off-by: Franck LECUYER <[email protected]>

Author: FranckLecuyer

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisWorkerService.java

@@ -191,7 +191,7 @@ public Consumer<Flux<Message<String>>> consumeRun() {
                                     LOGGER.info("Security analysis complete (resultUuid='{}')", resultContext.getResultUuid());
                                 } else {  // result not available : stop computation request
                                     if (cancelComputationRequests.get(resultContext.getResultUuid()) != null) {
-                                        stoppedPublisherService.publish(resultContext.getResultUuid(), cancelComputationRequests.get(resultContext.getResultUuid()).getReceiver());
+                                        stoppedPublisherService.publishCancel(resultContext.getResultUuid(), cancelComputationRequests.get(resultContext.getResultUuid()).getReceiver());
                                         LOGGER.info("Security analysis stopped (resultUuid='{}')", resultContext.getResultUuid());
                                     }
                                 }
@@ -210,11 +210,6 @@ public Consumer<Flux<Message<String>>> consumeRun() {
                                 runRequests.remove(resultContext.getResultUuid());
                             });
                 })
-                .onErrorContinue((t, r) -> {
-                    if (!(t instanceof CancellationException)) {
-                        LOGGER.error("Exception in consumeRun", t);
-                    }
-                })
                 .subscribe();
     }