Index: jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java
===================================================================
RCS file: /home/cvspublic/jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java,v
retrieving revision 1.6
diff -u -r1.6 POP3Handler.java
--- jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java	27 Feb 2002 04:47:22 -0000	1.6
+++ jakarta-james/src/java/org/apache/james/pop3server/POP3Handler.java	27 Jul 2002 19:31:48 -0000
@@ -163,8 +163,8 @@
 
     private boolean parseCommand(String commandRaw) {
         if (commandRaw == null) return false;
-        getLogger().info("Command received: " + commandRaw);
         String command = commandRaw.trim();
+        commandRaw = command;
         StringTokenizer commandLine = new StringTokenizer(command, " ");
         int arguments = commandLine.countTokens();
         if (arguments == 0) {
@@ -179,6 +179,14 @@
         String argument1 = (String) null;
         if(arguments > 2) {
             argument1 = commandLine.nextToken();
+        }
+        if (getLogger().isInfoEnabled()) {
+            // Don't display password in logger
+            if (!command.equalsIgnoreCase("PASS")) {
+                getLogger().info("Command received: " + commandRaw);
+            } else {
+                getLogger().info("Command received: PASS <password omitted>");
+            }
         }
 
         if (command.equalsIgnoreCase("USER"))