X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Futil%2FResourceFileUtil.java;h=5deee4679a0c2a42bd6a6649b95fb79a3a01166c;hb=2d9f989e0d37002c758bdf66a3f25fcfdac35b62;hp=0402754ac0015dc5fcb60b9cfc9d54d3e61bce00;hpb=32b15cbf9626866efb8fb9159b1d4ac208be6a36;p=clamp.git

diff --git a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java b/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java
index 0402754a..5deee467 100644
--- a/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java
+++ b/src/main/java/org/onap/clamp/clds/util/ResourceFileUtil.java
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 
 package org.onap.clamp.clds.util;
@@ -55,13 +55,11 @@ public final class ResourceFileUtil {
      * Return resource as a String.
      */
     public static String getResourceAsString(String name) throws IOException {
-        InputStream is = getResourceAsStream(name);
-        Scanner scanner = new Scanner(is);
-        Scanner delimitedScanner = scanner.useDelimiter("\\A");
-        String text = delimitedScanner.hasNext() ? delimitedScanner.next() : "";
-        delimitedScanner.close();
-        scanner.close();
-        is.close();
-        return text;
+        try (InputStream is = getResourceAsStream(name)) {
+            try (Scanner scanner = new Scanner(is)) {
+                Scanner delimitedScanner = scanner.useDelimiter("\\A");
+                return delimitedScanner.hasNext() ? delimitedScanner.next() : "";
+            }
+        }
     }
 }