From 850cb04e331eb13f476c20b0c233005657ef8fa4 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 26 Jun 2014 11:38:55 +0000
Subject: [PATCH] handling FileNotFoundException for invalid properties file
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16135 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../ipd/descartes/adaptation/AdaptationControl.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 8cf8f52f..06e5275b 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -2,6 +2,7 @@ package edu.kit.ipd.descartes.adaptation;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
@@ -95,19 +96,24 @@ public class AdaptationControl {
// load required models, use absolute paht (http://www.jevon.org/wiki/Resolving_Proxy_EMF_Elements)
adaptationProcess = adaptationProcessModelLoader.load(URI.createFileURI(new File(
- adaptationProcessXmiFilePath).getAbsolutePath()));
+ adaptationProcessXmiFilePath).getAbsolutePath()));
perfDataRepoHandler = PerformanceDataRepositoryHandlerFactory.createHandler(pdrMetamodelType);
perfDataRepoHandler.load(performanceDataRepoXmiFilePath);
-
+
// set handlers
dmmModelActionHandler = new DmmModelActionHandler();
executor = new TacticExecutor(dmmModelActionHandler);
modelAnalyzer = new PcmModelAnalyzer(perfDataRepoHandler);
evaluator = new WeightingFunctionEvaluator();
+
+ } catch (FileNotFoundException e) {
+ logger.error("Properties file " + propertiesFile + " could not be found.");
+ abort();
} catch (IOException e) {
logger.error("Error while initializinig controller.", e);
abort();
}
+
}
public void doAdaptation(Event event) {
@@ -234,7 +240,7 @@ public class AdaptationControl {
*/
public void stop() {
logger.info("Stopping adaptation process");
- return;
+ System.exit(0);
}
/**
--
GitLab