diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index d15d02ab696..13d59d32622 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -944,8 +944,8 @@ public Map<String, Map<String, List<MetricDefinition>>> getServiceMetrics(String
 
       Gson gson = new Gson();
 
-      try {
-        map = gson.fromJson(new FileReader(svc.getMetricsFile()), type);
+      try (FileReader reader = new FileReader(svc.getMetricsFile())) {
+        map = gson.fromJson(reader, type);
 
         svc.setMetrics(processMetricDefinition(map));
 
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorFactory.java
index c61b1a4dbc1..3e7b76a5e98 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorFactory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorFactory.java
@@ -51,8 +51,8 @@ protected Map<String, Object> parseFile(File file) throws IOException {
     } else if (!file.isFile() || !file.canRead()) {
       throw new IOException(String.format("%s is not a readable file", file.getAbsolutePath()));
     } else {
-      try {
-        return new Gson().fromJson(new FileReader(file),
+      try (FileReader reader = new FileReader(file)) {
+        return new Gson().fromJson(reader,
             new TypeToken<Map<String, Object>>() {
             }.getType());
       } catch (JsonSyntaxException e) {