From 636eaeafd7c6284b8c31ad94845ffab5c0391911 Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Mon, 12 Oct 2009 20:27:50 +0000
Subject: [PATCH] Fix from audit

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@777 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 src/java/davmail/BundleMessage.java       |  5 +++--
 src/java/davmail/ldap/LdapConnection.java | 12 +++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/java/davmail/BundleMessage.java b/src/java/davmail/BundleMessage.java
index 7752326d..849d965d 100644
--- a/src/java/davmail/BundleMessage.java
+++ b/src/java/davmail/BundleMessage.java
@@ -24,13 +24,14 @@ import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.io.Serializable;
 
 /**
  * Internationalization message.
  */
-public class BundleMessage {
+public class BundleMessage implements Serializable {
     /**
-     *  Root locale to get english messages for logging.
+     * Root locale to get english messages for logging.
      */
     public static final Locale ROOT_LOCALE = new Locale("", "");
     protected static final String MESSAGE_BUNDLE_NAME = "davmailmessages";
diff --git a/src/java/davmail/ldap/LdapConnection.java b/src/java/davmail/ldap/LdapConnection.java
index eb5c7189..1d86c69d 100644
--- a/src/java/davmail/ldap/LdapConnection.java
+++ b/src/java/davmail/ldap/LdapConnection.java
@@ -575,8 +575,6 @@ public class LdapConnection extends AbstractConnection {
                             // append personal contacts first
                             String filter = ldapFilter.getContactSearchFilter();
 
-                            DavGatewayTray.debug(new BundleMessage("LOG_LDAP_REQ_SEARCH", currentMessageId, dn, scope, sizeLimit, timelimit, filter, returningAttributes));
-
                             for (Map<String, String> person : session.contactFind(filter).values()) {
                                 persons.put(person.get("uid"), person);
 
@@ -974,15 +972,15 @@ public class LdapConnection extends AbstractConnection {
     }
 
     static interface LdapFilter {
-        public String getContactSearchFilter();
+        String getContactSearchFilter();
 
-        public Map<String, Map<String, String>> findInGAL(ExchangeSession session) throws IOException;
+        Map<String, Map<String, String>> findInGAL(ExchangeSession session) throws IOException;
 
-        public void add(LdapFilter filter);
+        void add(LdapFilter filter);
 
-        public boolean isFullSearch();
+        boolean isFullSearch();
 
-        public boolean isMatch(Map<String, String> person);
+        boolean isMatch(Map<String, String> person);
     }
 
     static class CompoundFilter implements LdapFilter {