From 3663d7269ca37b8ac2a5af62e1f86557d9766462 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 29 Sep 2020 13:37:21 +0200
Subject: [PATCH] changes taken over

---
 tmtcservices/VerificationReporter.cpp | 13 +++++++------
 tmtcservices/VerificationReporter.h   |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/tmtcservices/VerificationReporter.cpp b/tmtcservices/VerificationReporter.cpp
index 4255c5ae..7e40bd27 100644
--- a/tmtcservices/VerificationReporter.cpp
+++ b/tmtcservices/VerificationReporter.cpp
@@ -1,12 +1,13 @@
-#include "../tmtcservices/VerificationReporter.h"
+#include "VerificationReporter.h"
+#include "AcceptsVerifyMessageIF.h"
+#include "PusVerificationReport.h"
 
 #include "../ipc/MessageQueueIF.h"
-#include "../tmtcservices/AcceptsVerifyMessageIF.h"
-#include "../tmtcservices/PusVerificationReport.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "../objectmanager/frameworkObjects.h"
 
-object_id_t VerificationReporter::messageReceiver = objects::PUS_SERVICE_1_VERIFICATION;
+object_id_t VerificationReporter::messageReceiver =
+		objects::PUS_SERVICE_1_VERIFICATION;
 
 VerificationReporter::VerificationReporter() :
 		acknowledgeQueue(MessageQueueIF::NO_QUEUE) {
@@ -98,8 +99,8 @@ void VerificationReporter::initialize() {
 	if (temp == nullptr) {
 		sif::error << "VerificationReporter::initialize: Message "
 				<< "receiver invalid. Make sure it is set up properly and "
-				<<"implementsAcceptsVerifyMessageIF" << std::endl;
-
+				<< "implementsAcceptsVerifyMessageIF" << std::endl;
+		return;
 	}
 	this->acknowledgeQueue = temp->getVerificationQueue();
 }
diff --git a/tmtcservices/VerificationReporter.h b/tmtcservices/VerificationReporter.h
index 4d92f6b3..f26fa54f 100644
--- a/tmtcservices/VerificationReporter.h
+++ b/tmtcservices/VerificationReporter.h
@@ -1,8 +1,8 @@
-#ifndef FRAMEWORK_TMTCSERVICES_VERIFICATIONREPORTER_H_
-#define FRAMEWORK_TMTCSERVICES_VERIFICATIONREPORTER_H_
+#ifndef FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_
+#define FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_
 
+#include "PusVerificationReport.h"
 #include "../objectmanager/ObjectManagerIF.h"
-#include "../tmtcservices/PusVerificationReport.h"
 
 namespace Factory{
 void setStaticFrameworkObjectIds();
@@ -47,4 +47,4 @@ private:
 	MessageQueueId_t acknowledgeQueue;
 };
 
-#endif /* FRAMEWORK_TMTCSERVICES_VERIFICATIONREPORTER_H_ */
+#endif /* FSFW_TMTCSERVICES_VERIFICATIONREPORTER_H_ */