svn commit: r1762172 - /tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java

[ma...@apache.org]

Author: markt
Date: Sun Sep 25 09:47:25 2016
New Revision: 1762172

URL: http://svn.apache.org/viewvc?rev=1762172&view=rev
Log:
Clean-up / formatting
No functional change.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java

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=1762172&r1=1762171&r2=1762172&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/PasswdUserDatabase.java Sun Sep 25 09:47:25 2016
@@ -14,43 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 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;
 
-
 /**
  * Concrete implementation of the <code>UserDatabase</code> interface
  * that processes the <code>/etc/passwd</code> file on a Unix system.
  *
  * @author Craig R. McClanahan
  */
-public final class PasswdUserDatabase
-    implements UserDatabase {
-
-
-    // --------------------------------------------------------- Constructors
-
-
-    /**
-     * Initialize a new instance of this user database component.
-     */
-    public PasswdUserDatabase() {
-
-        super();
-
-    }
-
-
-    // --------------------------------------------------- Instance Variables
-
+public final class PasswdUserDatabase implements UserDatabase {
 
     /**
      * The pathname of the Unix password file.
@@ -70,17 +48,12 @@ public final class PasswdUserDatabase
     private UserConfig userConfig = null;
 
 
-    // ----------------------------------------------------------- Properties
-
-
     /**
      * Return the UserConfig listener with which we are associated.
      */
     @Override
     public UserConfig getUserConfig() {
-
-        return (this.userConfig);
-
+        return userConfig;
     }
 
 
@@ -91,16 +64,11 @@ public final class PasswdUserDatabase
      */
     @Override
     public void setUserConfig(UserConfig userConfig) {
-
         this.userConfig = userConfig;
         init();
-
     }
 
 
-    // ------------------------------------------------------- Public Methods
-
-
     /**
      * Return an absolute pathname to the home directory for the specified user.
      *
@@ -108,9 +76,7 @@ public final class PasswdUserDatabase
      */
     @Override
     public String getHome(String user) {
-
         return homes.get(user);
-
     }
 
 
@@ -119,15 +85,10 @@ public final class PasswdUserDatabase
      */
     @Override
     public Enumeration<String> getUsers() {
-
-        return (homes.keys());
-
+        return homes.keys();
     }
 
 
-    // ------------------------------------------------------ Private Methods
-
-
     /**
      * Initialize our set of users and home directories.
      */
@@ -135,28 +96,29 @@ public final class PasswdUserDatabase
 
         BufferedReader reader = null;
         try {
-
             reader = new BufferedReader(new FileReader(PASSWORD_FILE));
 
             while (true) {
-
                 // Accumulate the next line
                 StringBuilder buffer = new StringBuilder();
                 while (true) {
                     int ch = reader.read();
-                    if ((ch < 0) || (ch == '\n'))
+                    if ((ch < 0) || (ch == '\n')) {
                         break;
+                    }
                     buffer.append((char) ch);
                 }
                 String line = buffer.toString();
-                if (line.length() < 1)
+                if (line.length() < 1) {
                     break;
+                }
 
                 // Parse the line into constituent elements
                 int n = 0;
                 String tokens[] = new String[7];
-                for (int i = 0; i < tokens.length; i++)
+                for (int i = 0; i < tokens.length; i++) {
                     tokens[i] = null;
+                }
                 while (n < tokens.length) {
                     String token = null;
                     int colon = line.indexOf(':');
@@ -171,9 +133,9 @@ public final class PasswdUserDatabase
                 }
 
                 // Add this user and corresponding directory
-                if ((tokens[0] != null) && (tokens[5] != null))
+                if ((tokens[0] != null) && (tokens[5] != null)) {
                     homes.put(tokens[0], tokens[5]);
-
+                }
             }
 
             reader.close();
@@ -189,8 +151,5 @@ public final class PasswdUserDatabase
                 reader = null;
             }
         }
-
     }
-
-
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org