summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Nelson <nelson24@att.com>2019-07-23 16:10:10 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-23 16:10:10 +0000
commitd0a5395c64cacb9028a709671181a1bf986569c6 (patch)
tree93bd13d853dc59ff7f8378966658a60ac6df1d2f
parentd15e7efebc134df5f18151dfd53fbe3209f5b905 (diff)
parent39c180873d82310b9812c2c7d9b0efc56d9b09d1 (diff)
Merge "Handled unclosed resources using try-with-resources statement"
-rw-r--r--src/main/java/org/onap/music/main/CipherUtil.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/onap/music/main/CipherUtil.java b/src/main/java/org/onap/music/main/CipherUtil.java
index 0d5b7710..53333238 100644
--- a/src/main/java/org/onap/music/main/CipherUtil.java
+++ b/src/main/java/org/onap/music/main/CipherUtil.java
@@ -1,9 +1,11 @@
/*
* ============LICENSE_START==========================================
- * org.onap.music
+ * org.onap.music
* ===================================================================
* Copyright (c) 2017 AT&T Intellectual Property
* ===================================================================
+ * Modification Copyright (c) 2019 IBM
+ * ===================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -245,13 +247,12 @@ public class CipherUtil {
public static void readAndSetKeyString() {
- try {
- Scanner in = new Scanner(new FileReader("/opt/app/music/etc/properties.txt"));
+ try (Scanner in = new Scanner(new FileReader("/opt/app/music/etc/properties.txt"))) {
+
StringBuilder sb = new StringBuilder();
while(in.hasNext()) {
sb.append(in.next());
}
- in.close();
keyString = sb.toString();
} catch (FileNotFoundException e) {
logger.error(EELFLoggerDelegate.errorLogger, e.getMessage());