summaryrefslogtreecommitdiffstats
path: root/engine-d/src/main/java/org/onap
diff options
context:
space:
mode:
authorGuangrong Fu <fu.guangrong@zte.com.cn>2018-01-24 08:31:09 +0800
committerGuangrong Fu <fu.guangrong@zte.com.cn>2018-01-26 17:07:58 +0800
commit6ed6d53a97b448ee85590948bbbdf83b447c865b (patch)
tree7cd60676887bea7c79c996c11c79f27a30632b92 /engine-d/src/main/java/org/onap
parent7df1d4f878939e2f9eb9b9d3b70d3478f12c5a4d (diff)
Testing the Impacts of Dependency Version
Change-Id: I3990946b0345fdf0f791844f01f2bb0af3c64ed2 Issue-ID: HOLMES-116 Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>
Diffstat (limited to 'engine-d/src/main/java/org/onap')
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java2
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java2
-rw-r--r--engine-d/src/main/java/org/onap/holmes/engine/resources/SwaggerResource.java11
3 files changed, 13 insertions, 2 deletions
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java b/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java
index 1b774d8..40a3940 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dcae/DcaeConfigurationPolling.java
@@ -31,7 +31,7 @@ public class DcaeConfigurationPolling implements Runnable {
private String hostname;
- public static long POLLING_PERIOD = 30 * 1000L;
+ public static final long POLLING_PERIOD = 30 * 1000L;
private String prevConfigMd5 = Md5Util.md5(null);
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
index 009de8e..862895b 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/DMaaPAlarmPolling.java
@@ -49,6 +49,7 @@ public class DMaaPAlarmPolling implements Runnable {
Thread.sleep(60000);
} catch (InterruptedException e1) {
log.info("Thread is still active.", e);
+ Thread.currentThread().interrupt();
}
} catch (Exception e) {
log.error("An error occurred while processing alarm. Sleep for 60 seconds to restart.", e);
@@ -56,6 +57,7 @@ public class DMaaPAlarmPolling implements Runnable {
Thread.sleep(60000);
} catch (InterruptedException e1) {
log.info("Thread is still active.", e);
+ Thread.currentThread().interrupt();
}
}
}
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/resources/SwaggerResource.java b/engine-d/src/main/java/org/onap/holmes/engine/resources/SwaggerResource.java
index 6bc68c5..a20b578 100644
--- a/engine-d/src/main/java/org/onap/holmes/engine/resources/SwaggerResource.java
+++ b/engine-d/src/main/java/org/onap/holmes/engine/resources/SwaggerResource.java
@@ -44,11 +44,12 @@ public class SwaggerResource {
public String getSwaggerJson() {
URL url = SwaggerResource.class.getResource("/swagger.json");
String ret = "{}";
+ BufferedReader br = null;
try {
System.out.println(URLDecoder.decode(url.getPath(), "UTF-8"));
File file = new File(URLDecoder.decode(url.getPath(), "UTF-8"));
- BufferedReader br = new BufferedReader(new FileReader(file));
+ br = new BufferedReader(new FileReader(file));
StringBuffer buffer = new StringBuffer();
String line = " ";
while ((line = br.readLine()) != null) {
@@ -59,6 +60,14 @@ public class SwaggerResource {
log.warn("Failed to read the API description file.");
} catch (IOException e) {
log.warn("An error occurred while reading swagger.json.");
+ } finally {
+ if (br != null) {
+ try {
+ br.close();
+ } catch (IOException e) {
+ log.warn("Failed to close the file reader. This may cause memory leak.");
+ }
+ }
}
return ret;
}