Merge "Fix for robustness"

author Henrik Andersson <henrik.b.andersson@est.tech>

Wed, 22 May 2019 10:15:51 +0000 (10:15 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 22 May 2019 10:15:51 +0000 (10:15 +0000)
author Henrik Andersson <henrik.b.andersson@est.tech>
Wed, 22 May 2019 10:15:51 +0000 (10:15 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 22 May 2019 10:15:51 +0000 (10:15 +0000)
diff --cc datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
Simple merge
author	Henrik Andersson <henrik.b.andersson@est.tech>
	Wed, 22 May 2019 10:15:51 +0000 (10:15 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 22 May 2019 10:15:51 +0000 (10:15 +0000)