Author: markt
Date: Mon Sep 26 16:12:08 2016
New Revision: 1762348
URL: http://svn.apache.org/viewvc?rev=1762348&view=rev
Log:
Use try-with-resources and log exceptions
Modified:
tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties?rev=1762348&r1=1762347&r2=1762348&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.properties Mon
Sep 26 16:12:08 2016
@@ -121,6 +121,7 @@ hostConfig.stop=HostConfig: Processing S
hostConfig.undeploy=Undeploying context [{0}]
hostConfig.resourceNotAbsolute=Unable to remove resource from context [{0}]
since [{1}] is not absolute
hostConfig.undeployVersion=Undeploying old version of context [{0}] which has
no active session
+passwdUserDatabase.readFail=Failed to obtain a complete set of users from
/etc/passwd
userConfig.database=Exception loading user database
userConfig.deploy=Deploying web application for user {0}
userConfig.deploying=Deploying user web applications
Modified: tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java?rev=1762348&r1=1762347&r2=1762348&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java Mon
Sep 26 16:12:08 2016
@@ -18,10 +18,13 @@ package org.apache.catalina.startup;
import java.io.BufferedReader;
import java.io.FileReader;
-import java.io.IOException;
import java.util.Enumeration;
import java.util.Hashtable;
+import org.apache.juli.logging.Log;
+import org.apache.juli.logging.LogFactory;
+import org.apache.naming.StringManager;
+
/**
* Concrete implementation of the <code>UserDatabase</code> interface
* that processes the <code>/etc/passwd</code> file on a Unix system.
@@ -30,6 +33,9 @@ import java.util.Hashtable;
*/
public final class PasswdUserDatabase implements UserDatabase {
+ private static final Log log = LogFactory.getLog(PasswdUserDatabase.class);
+ private static final StringManager sm =
StringManager.getManager(PasswdUserDatabase.class);
+
/**
* The pathname of the Unix password file.
*/
@@ -94,10 +100,7 @@ public final class PasswdUserDatabase im
*/
private void init() {
- BufferedReader reader = null;
- try {
- reader = new BufferedReader(new FileReader(PASSWORD_FILE));
-
+ try (BufferedReader reader = new BufferedReader(new
FileReader(PASSWORD_FILE))) {
while (true) {
// Accumulate the next line
StringBuilder buffer = new StringBuilder();
@@ -137,19 +140,8 @@ public final class PasswdUserDatabase im
homes.put(tokens[0], tokens[5]);
}
}
-
- reader.close();
- reader = null;
-
} catch (Exception e) {
- if (reader != null) {
- try {
- reader.close();
- } catch (IOException f) {
- // Ignore
- }
- reader = null;
- }
+ log.warn(sm.getString("passwdUserDatabase.readFail"), e);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
