Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java @ 3697:2e12518ff5b4
Removed trailing whitespace. Reverted functional change in parsing plain user file.
flys-client/trunk@5396 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Sat, 08 Sep 2012 12:22:53 +0000 |
| parents | a050cb5f303f |
| children |
comparison
equal
deleted
inserted
replaced
| 3696:a050cb5f303f | 3697:2e12518ff5b4 |
|---|---|
| 94 new BufferedReader( | 94 new BufferedReader( |
| 95 new FileReader(file)); | 95 new FileReader(file)); |
| 96 try { | 96 try { |
| 97 String line; | 97 String line; |
| 98 while ((line = reader.readLine()) != null) { | 98 while ((line = reader.readLine()) != null) { |
| 99 if (line.startsWith("#")) { | 99 if ((line = line.trim()).length() == 0 |
| 100 || line.startsWith("#")) { | |
| 100 continue; | 101 continue; |
| 101 } | 102 } |
| 102 | 103 |
| 103 String[] parts = line.split("\\s+"); | 104 String[] parts = line.split("\\s+"); |
| 104 if (parts.length < 2) { | 105 if (parts.length < 2) { |
| 105 continue; | 106 continue; |
| 106 } | 107 } |
| 107 | 108 |
| 108 if (parts[0].equals(username)) { | 109 if (parts[0].equals(username)) { |
| 109 log.debug("user '" + username + "' found."); | 110 log.debug("user '" + username + "' found."); |
| 110 if (parts[1].equals(password)) { | 111 if (parts[1].equals(password)) { |
| 111 List<String> roles = | 112 List<String> roles = |
| 112 new ArrayList<String>(parts.length - 2); | 113 new ArrayList<String>(parts.length - 2); |