Skip to content

AMBARI-26596: Fixing fd leak during kerberizing #4124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HalimKim wants to merge 1 commit into
base: trunk
Choose a base branch
from
+4 −4
Open

AMBARI-26596: Fixing fd leak during kerberizing #4124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/apache/ambari/server/state/kerberos/AbstractKerberosDescriptorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down