This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new e9190e3094 Fix resource leak
e9190e3094 is described below
commit e9190e30948a36ae03dfd863b3a23d79433f67eb
Author: remm <r...@apache.org>
AuthorDate: Tue Aug 20 16:32:29 2024 +0200
Fix resource leak
Found by coverity.
---
java/org/apache/catalina/realm/RealmBase.java | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/java/org/apache/catalina/realm/RealmBase.java
b/java/org/apache/catalina/realm/RealmBase.java
index c441d51ecf..62dec92d97 100644
--- a/java/org/apache/catalina/realm/RealmBase.java
+++ b/java/org/apache/catalina/realm/RealmBase.java
@@ -1432,15 +1432,9 @@ public abstract class RealmBase extends
LifecycleMBeanBase implements Realm {
// If the file name is used, then don't parse the trailing
arguments
argIndex = args.length;
- try {
- BufferedReader br;
- // Special case, allow for - filename to refer to stdin
- if (passwordFile.equals("-")) {
- br = new BufferedReader(new InputStreamReader(System.in));
- } else {
- br = new BufferedReader(new FileReader(passwordFile));
- }
-
+ // Special case, allow for - filename to refer to stdin
+ try (BufferedReader br = passwordFile.equals("-") ? new
BufferedReader(new InputStreamReader(System.in))
+ : new BufferedReader(new FileReader(passwordFile))) {
String line;
while ((line = br.readLine()) != null) {
// Mutate each line in the file, or stdin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
