From b20d4ffd7a75c1aa11917655d45a6c36ba15025a Mon Sep 17 00:00:00 2001
From: jomu <jomu@711a9084-f618-47a6-a783-754c49204487>
Date: Sat, 21 Feb 2015 15:43:55 +0000
Subject: [PATCH] fixed sonar bugs

---
 .../shared/jeeutil/AuthenticationFilter.java  | 16 ++++++--------
 .../shared/security/PasswordUtil.java         | 21 ++++++-------------
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java
index 8486511..78c0a9e 100644
--- a/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java
+++ b/jeeutil/src/main/java/de/muehlencord/shared/jeeutil/AuthenticationFilter.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package de.muehlencord.shared.jeeutil;
 
 import java.io.BufferedReader;
@@ -20,7 +16,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
-import static org.apache.log4j.Logger.getLogger;
 
 /**
  *
@@ -28,7 +23,7 @@ import static org.apache.log4j.Logger.getLogger;
  */
 public class AuthenticationFilter implements Filter {
 
-    private final static Logger logger = getLogger(AuthenticationFilter.class.getName());
+    private final static Logger LOGGER = Logger.getLogger(AuthenticationFilter.class);
     private final static String USER = AuthenticationFilter.class.getName() + "_user";
     private String loginPage;
     private String errorPage;
@@ -56,17 +51,18 @@ public class AuthenticationFilter implements Filter {
         if (session != null) {
             if (session.getAttribute(USER) != null) {
                 currentUser = (User) session.getAttribute(USER);
+                LOGGER.debug ("found "+currentUser); 
             } else {
-                logger.debug("No active session found - going to force login");
+                LOGGER.debug("No active session found - going to force login");
                 filterConfig.getServletContext().getRequestDispatcher(loginPage).forward(request, response);
             }
         } else {
 
             if (currentUser == null) {
-                logger.debug("No logged in user found - going to force login");
+                LOGGER.debug("No logged in user found - going to force login");
                 filterConfig.getServletContext().getRequestDispatcher(loginPage).forward(request, response);
             } else {
-                logger.debug("User is authenticated, continue filter chain");
+                LOGGER.debug("User is authenticated, continue filter chain");
                 // user is authenticated, continue with filter chain
                 chain.doFilter(request, response);
             }
@@ -97,7 +93,7 @@ public class AuthenticationFilter implements Filter {
             pw.print("</html>");
 
         } catch (Exception ex) {
-            logger.log(Level.ERROR, errorMsg, ex);
+            LOGGER.log(Level.ERROR, errorMsg, ex);
         }
     }
 
diff --git a/security/src/main/java/de/muehlencord/shared/security/PasswordUtil.java b/security/src/main/java/de/muehlencord/shared/security/PasswordUtil.java
index 97d4351..01f6379 100644
--- a/security/src/main/java/de/muehlencord/shared/security/PasswordUtil.java
+++ b/security/src/main/java/de/muehlencord/shared/security/PasswordUtil.java
@@ -1,7 +1,3 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
 package de.muehlencord.shared.security;
 
 import static com.lambdaworks.crypto.SCryptUtil.check;
@@ -11,8 +7,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.Arrays;
 import org.apache.commons.codec.binary.Base64;
-import org.apache.log4j.Logger;
-import static org.apache.log4j.Logger.getLogger;
 /**
  *
  * @author joern@muehlencord.de
@@ -20,9 +14,8 @@ import static org.apache.log4j.Logger.getLogger;
 public abstract class PasswordUtil {
 
     /** logging object */
-    private final static Logger logger = getLogger(PasswordUtil.class);
-    
-    
+    // private final static Logger LOGGER = Logger.getLogger(PasswordUtil.class);
+       
     /** SCrypt CPU cost parameter */
     private final static int scryptCpuCostParameter = 16384;
     /** SCrypt memory cost parameter */
@@ -105,13 +98,11 @@ public abstract class PasswordUtil {
      *
      * @throws SecurityException if the random string could not be computed
      */
-    public static String getRandomString(String prefix, int length) throws SecurityException {
-        if (prefix == null) {
-            prefix = "";
-        }
-        int idLength = length - prefix.length();
+    public static String getRandomString(final String prefix, int length) throws SecurityException {
+        String usedPrefix = (prefix == null ? "" : prefix); 
+        
+        int idLength = length - usedPrefix.length();
         return prefix + createSaltString(idLength);
-
     }