# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1347106973 0
# Node ID 2e12518ff5b440d74e3b30a8fcdbeb083c7acc8d
# Parent  a050cb5f303fc6d1a5aa4ad4ef02b2f58e8c0f53
Removed trailing whitespace. Reverted functional change in parsing plain user file.

flys-client/trunk@5396 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r a050cb5f303f -r 2e12518ff5b4 flys-client/ChangeLog
--- a/flys-client/ChangeLog	Sat Sep 08 11:26:30 2012 +0000
+++ b/flys-client/ChangeLog	Sat Sep 08 12:22:53 2012 +0000
@@ -1,3 +1,13 @@
+2012-09-08	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java:
+	  Reverted functional change from clins last commit.
+
+	* src/main/java/de/intevation/flys/client/server/LoginServlet.java,
+	  src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java,
+	  src/main/java/de/intevation/flys/client/server/auth/UserClient.java:
+	  Removed trailing whitespace.
+
 2012-09-08	Christian Lins	<christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/server/RemoteServiceServlet.java,
diff -r a050cb5f303f -r 2e12518ff5b4 flys-client/src/main/java/de/intevation/flys/client/server/LoginServlet.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/LoginServlet.java	Sat Sep 08 11:26:30 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/LoginServlet.java	Sat Sep 08 12:22:53 2012 +0000
@@ -49,7 +49,7 @@
 
     @Override
     protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-    throws ServletException, IOException 
+    throws ServletException, IOException
     {
         String encoding = req.getCharacterEncoding();
         String username = req.getParameter("username");
@@ -62,7 +62,7 @@
             this.redirectFailure(resp);
             return;
         }
-        
+
         try {
             Authentication aresp = this.auth(username, password, encoding);
             if (aresp == null || !aresp.isSuccess()) {
@@ -94,7 +94,7 @@
     }
 
     private Authentication auth(String username, String password, String encoding)
-        throws AuthenticationException, IOException 
+        throws AuthenticationException, IOException
     {
         ServletContext sc = this.getServletContext();
         Features features = (Features)sc.getAttribute(Features.CONTEXT_ATTRIBUTE);
diff -r a050cb5f303f -r 2e12518ff5b4 flys-client/src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java	Sat Sep 08 11:26:30 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/AuthenticationFactory.java	Sat Sep 08 12:22:53 2012 +0000
@@ -13,7 +13,7 @@
         if (name == null) {
             throw new IllegalArgumentException("Authentication type name is null");
         }
-        
+
         if (name.equalsIgnoreCase("was") ||
             name.equalsIgnoreCase("ggina")) {
             log.debug("Using GGinA authenticator.");
@@ -25,7 +25,7 @@
             return
                 new de.intevation.flys.client.server.auth.plain.Authenticator();
         }
-        
+
         throw new IllegalArgumentException("Unkown Authentication " + name);
     }
 }
diff -r a050cb5f303f -r 2e12518ff5b4 flys-client/src/main/java/de/intevation/flys/client/server/auth/UserClient.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/UserClient.java	Sat Sep 08 11:26:30 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/UserClient.java	Sat Sep 08 12:22:53 2012 +0000
@@ -54,7 +54,7 @@
             logger.warn("createUser: given user is null");
             return false;
         }
-        
+
         logger.debug("Creating new user " + user.getName());
         HttpClient client = new HttpClientImpl(this.url);
 
@@ -115,7 +115,7 @@
         if(user == null) {
             throw new IllegalArgumentException("user is null");
         }
-        
+
         HttpClient client = new HttpClientImpl(this.url);
 
         Document document = XMLUtils.newDocument();
diff -r a050cb5f303f -r 2e12518ff5b4 flys-client/src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java
--- a/flys-client/src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java	Sat Sep 08 11:26:30 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/server/auth/plain/Authenticator.java	Sat Sep 08 12:22:53 2012 +0000
@@ -96,15 +96,16 @@
         try {
             String line;
             while ((line = reader.readLine()) != null) {
-                if (line.startsWith("#")) {
+                if ((line = line.trim()).length() == 0
+                || line.startsWith("#")) {
                     continue;
                 }
-                
+
                 String[] parts = line.split("\\s+");
                 if (parts.length < 2) {
                     continue;
                 }
-                
+
                 if (parts[0].equals(username)) {
                     log.debug("user '" + username + "' found.");
                     if (parts[1].equals(password)) {