JavaIsJavaScript
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractChargePointServiceInvoker.java‎
Lines changed: 19 additions & 0 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/AbstractChargePointServiceInvoker.java‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingPipeline.java‎
Lines changed: 2 additions & 10 deletions b/‎src/main/java/de/rwth/idsg/steve/ocpp/ws/pipeline/OutgoingPipeline.java‎
Lines changed: 2 additions & 10 deletions
@@ -9,6 +9,8 @@
 import de.rwth.idsg.steve.ocpp.ws.data.OcppJsonCall;
 import de.rwth.idsg.steve.ocpp.ws.pipeline.OutgoingPipeline;
 import lombok.Setter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.UUID;
@@ -18,13 +20,30 @@
  * @since 20.03.2015
  */
 public abstract class AbstractChargePointServiceInvoker {
+    private final Logger log = LoggerFactory.getLogger(getClass());
 
     @Autowired private OutgoingPipeline outgoingPipeline;
 
     @Setter private TypeStore typeStore;
     @Setter private AbstractWebSocketEndpoint endpoint;
 
+    /**
+     * Just a wrapper to make try-catch block and exception handling stand out
+     */
     public void runPipeline(String chargeBoxId, RequestType request, OcppResponseHandler handler) {
+        try {
+            run(chargeBoxId, request, handler);
+        } catch (Exception e) {
+            log.error("Exception occurred", e);
+            // Outgoing call failed due to technical problems. Pass the exception to handler to inform the user
+            handler.handleException(e);
+        }
+    }
+
+    /**
+     * Actual processing
+     */
+    private void run(String chargeBoxId, RequestType request, OcppResponseHandler handler) {
         String messageId = UUID.randomUUID().toString();
         ActionResponsePair pair = typeStore.findActionResponse(request);
         if (pair == null) {
 
@@ -22,16 +22,8 @@ public class OutgoingPipeline implements Pipeline {
 
     @Override
     public void run(CommunicationContext context) {
-        try {
-            serializer.process(context);
-            sender.process(context);
-
-        } catch (Exception e) {
-            log.error("Exception occurred", e);
-            // Outgoing call failed due to technical problems. Pass the exception to handler to inform the user.
-            context.getFutureResponseContext().getHandler().handleException(e);
-            return;
-        }
+        serializer.process(context);
+        sender.process(context);
 
         // All went well, and the call is sent. Store the response context for later lookup.
         futureResponseContextStore.add(context.getSession(),