chore: fixed some sonar issues

Refs: XRDDEV-2628
nordic-institute · Oct 17, 2024 · 9d0d868 · 9d0d868
1 parent 94b9156
commit 9d0d868
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/client/src/main/java/org/niis/xrd4j/client/SOAPClientImpl.java b/src/client/src/main/java/org/niis/xrd4j/client/SOAPClientImpl.java
@@ -93,14 +93,15 @@ public SOAPMessage send(final SOAPMessage request, final String url) throws SOAP
             LOGGER.error(ex.getMessage(), ex);
             throw new XRd4JRuntimeException(ex.getMessage());
         }
-        SOAPConnection connection = connectionFactory.createConnection();
-        LOGGER.debug(SEND_SOAP_TO, url);
-        LOGGER.trace("Outgoing SOAP request : \"{}\".", SOAPHelper.toString(request));
-        SOAPMessage response = connection.call(request, client);
-        LOGGER.debug("SOAP response received.");
-        LOGGER.trace("Incoming SOAP response : \"{}\".", SOAPHelper.toString(response));
-        connection.close();
-        return response;
+
+        try (SOAPConnection connection = connectionFactory.createConnection()) {
+            LOGGER.debug(SEND_SOAP_TO, url);
+            LOGGER.trace("Outgoing SOAP request : \"{}\".", SOAPHelper.toString(request));
+            SOAPMessage response = connection.call(request, client);
+            LOGGER.debug("SOAP response received.");
+            LOGGER.trace("Incoming SOAP response : \"{}\".", SOAPHelper.toString(response));
+            return response;
+        }
     }
 
     /**

diff --git a/src/server/src/main/java/org/niis/xrd4j/server/AbstractAdapterServlet.java b/src/server/src/main/java/org/niis/xrd4j/server/AbstractAdapterServlet.java
@@ -277,7 +277,7 @@ private SOAPMessage processServiceRequest(ServiceRequest serviceRequest) {
             }
         } catch (XRd4JException ex) {
             LOGGER.error(ex.getMessage(), ex);
-            if (serviceRequest.hasError()) {
+            if (serviceRequest != null && serviceRequest.hasError()) {
                 return this.errorToSOAP(this.cloneErrorMessage(serviceRequest.getErrorMessage()), null);
             } else {
                 return this.errorToSOAP(this.errInternalServerErr, null);