From 8c2d1037bb4adf590b13cd9a1fec0b4557131d7a Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Fri, 9 Aug 2024 17:43:50 +0300
Subject: [PATCH] Fix Sonar findings (#1810)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 .../java/org/eclipse/hawkbit/security/MDCHandler.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
index 6037ddbaa..fd9de1c37 100644
--- a/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
+++ b/hawkbit-security-core/src/main/java/org/eclipse/hawkbit/security/MDCHandler.java
@@ -125,12 +125,10 @@ public class MDCHandler {
                     put(MDC_KEY_USER, currentUser);
                 }
             }
+        } catch (final RuntimeException e) {
+            throw e;
         } catch (final Exception e) {
-            if (e instanceof RuntimeException) {
-                throw (RuntimeException) e;
-            } else {
-                throw new WrappedException(e);
-            }
+            throw new WrappedException(e);
         }
     }