Author: norman
Date: Sat Oct 8 18:14:52 2011
New Revision: 1180444
URL: http://svn.apache.org/viewvc?rev=1180444&view=rev
Log:
Call Logger.is*Enabled() before pass it to the logger. See IMAP-344
Modified:
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
Modified:
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
(original)
+++
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/base/AbstractImapCommandParser.java
Sat Oct 8 18:14:52 2011
@@ -85,7 +85,9 @@ public abstract class AbstractImapComman
result = decode(command, request, tag, session);
} catch (DecodingException e) {
- session.getLog().debug("Cannot parse protocol ", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Cannot parse protocol ", e);
+ }
result = statusResponseFactory.taggedBad(tag, command,
e.getKey());
}
}
Modified:
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
(original)
+++
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/main/DefaultImapDecoder.java
Sat Oct 8 18:14:52 2011
@@ -72,7 +72,9 @@ public class DefaultImapDecoder implemen
final String tag = request.tag();
message = decodeCommandTagged(request, tag, session);
} catch (DecodingException e) {
- logger.debug("Cannot parse tag", e);
+ if (logger.isDebugEnabled()) {
+ logger.debug("Cannot parse tag", e);
+ }
message = unknownCommand(null, session);
}
return message;
@@ -87,7 +89,9 @@ public class DefaultImapDecoder implemen
final String commandName = request.atom();
message = decodeCommandNamed(request, tag, commandName, session);
} catch (DecodingException e) {
- session.getLog().debug("Error during initial request parsing", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Error during initial request parsing",
e);
+ }
message = unknownCommand(tag, session);
}
return message;
@@ -124,7 +128,9 @@ public class DefaultImapDecoder implemen
}
final ImapCommandParser command = imapCommands.getParser(commandName);
if (command == null) {
- session.getLog().info("Missing command implementation.");
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Missing command implementation for
commmand " + commandName);
+ }
message = unknownCommand(tag, session);
} else {
message = command.parse(request, tag, session);
Modified:
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
(original)
+++
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/base/EndImapEncoder.java
Sat Oct 8 18:14:52 2011
@@ -44,7 +44,9 @@ public class EndImapEncoder implements I
*/
public void encode(ImapMessage message, ImapResponseComposer composer,
ImapSession session) throws IOException {
final Logger logger = session.getLog();
- logger.warn("Unknown message");
+ if (logger.isWarnEnabled()) {
+ logger.warn("Unknown message " + message);
+ }
if (logger.isDebugEnabled()) {
logger.debug("Chain end reached for " + message);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractAuthProcessor.java
Sat Oct 8 18:14:52 2011
@@ -58,13 +58,17 @@ public abstract class AbstractAuthProces
session.setAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY,
mailboxSession);
final MailboxPath inboxPath = buildFullPath(session,
MailboxConstants.INBOX);
if (mailboxManager.mailboxExists(inboxPath,
mailboxSession)) {
- session.getLog().debug("INBOX exists. No need to
create it.");
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("INBOX exists. No need to
create it.");
+ }
} else {
try {
session.getLog().debug("INBOX does not exist.
Creating it.");
mailboxManager.createMailbox(inboxPath,
mailboxSession);
} catch (MailboxExistsException e) {
- session.getLog().debug("Mailbox created by
concurrent call. Safe to ignore this exception.");
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Mailbox created by
concurrent call. Safe to ignore this exception.");
+ }
}
}
okComplete(command, tag, responder);
@@ -84,13 +88,17 @@ public abstract class AbstractAuthProces
session.setAttribute(ATTRIBUTE_NUMBER_OF_FAILURES,
failures);
no(command, tag, responder, failed);
} else {
- session.getLog().info("Too many authentication failures.
Closing connection.");
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Too many authentication
failures. Closing connection.");
+ }
bye(responder, HumanReadableText.TOO_MANY_FAILURES);
session.logout();
}
}
} catch (MailboxException e) {
- session.getLog().info("Login failed", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Login failed", e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AbstractMailboxProcessor.java
Sat Oct 8 18:14:52 2011
@@ -129,7 +129,9 @@ abstract public class AbstractMailboxPro
protected void unsolicitedResponses(final ImapSession session, final
ImapProcessor.Responder responder, boolean omitExpunged, boolean useUid) {
final SelectedMailbox selected = session.getSelected();
if (selected == null) {
- session.getLog().debug("No mailbox selected");
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("No mailbox selected");
+ }
} else {
unsolicitedResponses(session, responder, selected, omitExpunged,
useUid);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AppendProcessor.java
Sat Oct 8 18:14:52 2011
@@ -157,8 +157,9 @@ public class AppendProcessor extends Abs
* e.getKey());
*/
} catch (MailboxException e) {
- session.getLog().info("Unable to append message to mailbox " +
mailboxPath, e);
-
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Unable to append message to mailbox " +
mailboxPath, e);
+ }
// Some other issue
no(command, tag, responder, HumanReadableText.SAVE_FAILED);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/AuthenticateProcessor.java
Sat Oct 8 18:14:52 2011
@@ -87,7 +87,9 @@ public class AuthenticateProcessor exten
}
}
} else {
- session.getLog().debug ("Unsupported authentication mechanism '"
+ authType + "'");
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug ("Unsupported authentication mechanism
'" + authType + "'");
+ }
no(command, tag, responder,
HumanReadableText.UNSUPPORTED_AUTHENTICATION_MECHANISM);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CloseProcessor.java
Sat Oct 8 18:14:52 2011
@@ -55,7 +55,9 @@ public class CloseProcessor extends Abst
}
} catch (MailboxException e) {
- session.getLog().info("Close failed for mailbox " +
session.getSelected().getPath() , e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Close failed for mailbox " +
session.getSelected().getPath() , e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CopyProcessor.java
Sat Oct 8 18:14:52 2011
@@ -100,10 +100,14 @@ public class CopyProcessor extends Abstr
okComplete(command, tag, ResponseCode.copyUid(uidValidity,
idSet, resultUids), responder);
}
} catch (MessageRangeException e) {
- session.getLog().debug("Copy failed from mailbox " +
currentMailbox.getPath() + " to " + targetMailbox + " for invalid sequence-set
" + idSet.toString(), e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Copy failed from mailbox " +
currentMailbox.getPath() + " to " + targetMailbox + " for invalid sequence-set
" + idSet.toString(), e);
+ }
taggedBad(command, tag, responder,
HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- session.getLog().info("Copy failed from mailbox " +
currentMailbox.getPath() + " to " + targetMailbox + " for sequence-set " +
idSet.toString(), e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Copy failed from mailbox " +
currentMailbox.getPath() + " to " + targetMailbox + " for sequence-set " +
idSet.toString(), e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/CreateProcessor.java
Sat Oct 8 18:14:52 2011
@@ -55,10 +55,14 @@ public class CreateProcessor extends Abs
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
} catch (MailboxExistsException e) {
- session.getLog().debug("Create failed for mailbox " + mailboxPath
+ " as it already exists", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Create failed for mailbox " +
mailboxPath + " as it already exists", e);
+ }
no(command, tag, responder, HumanReadableText.MAILBOX_EXISTS);
} catch (MailboxException e) {
- session.getLog().info("Create failed for mailbox " + mailboxPath,
e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Create failed for mailbox " +
mailboxPath, e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DeleteProcessor.java
Sat Oct 8 18:14:52 2011
@@ -60,10 +60,14 @@ public class DeleteProcessor extends Abs
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
} catch (MailboxNotFoundException e) {
- session.getLog().debug("Delete failed for mailbox " + mailboxPath
+ " as it not exist", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Delete failed for mailbox " +
mailboxPath + " as it not exist", e);
+ }
no(command, tag, responder,
HumanReadableText.FAILURE_NO_SUCH_MAILBOX);
} catch (MailboxException e) {
- session.getLog().info("Delete failed for mailbox " + mailboxPath,
e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Delete failed for mailbox " +
mailboxPath, e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/EnableProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/EnableProcessor.java
Sat Oct 8 18:14:52 2011
@@ -71,7 +71,9 @@ public class EnableProcessor extends Abs
unsolicitedResponses(session, responder, false);
okComplete(command, tag, responder);
} catch (EnableException e) {
- session.getLog().info("Unable to enable extension", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Unable to enable extension", e);
+ }
taggedBad(command, tag, responder, HumanReadableText.FAILED);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ExpungeProcessor.java
Sat Oct 8 18:14:52 2011
@@ -91,10 +91,14 @@ public class ExpungeProcessor extends Ab
}
}
} catch (MessageRangeException e) {
- session.getLog().debug("Expunge failed", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Expunge failed", e);
+ }
taggedBad(command, tag, responder,
HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- session.getLog().info("Expunge failed for mailbox " +
session.getSelected().getPath(), e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Expunge failed for mailbox " +
session.getSelected().getPath(), e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/IdleProcessor.java
Sat Oct 8 18:14:52 2011
@@ -107,7 +107,9 @@ public class IdleProcessor extends Abstr
try {
mailboxManager.removeListener(sm.getPath(),
idleListener, mailboxSession);
} catch (MailboxException e) {
- session.getLog().info("Unable to remove idle
listener from mailbox", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Unable to remove idle
listener from mailbox", e);
+ }
}
}
session.popLineHandler();
@@ -154,7 +156,9 @@ public class IdleProcessor extends Abstr
} catch (MailboxException e) {
- session.getLog().info("Enable idle for " +
session.getSelected().getPath() + " failed", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Enable idle for " +
session.getSelected().getPath() + " failed", e);
+ }
// TODO: What should we do here?
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LSubProcessor.java
Sat Oct 8 18:14:52 2011
@@ -125,7 +125,9 @@ public class LSubProcessor extends Abstr
okComplete(command, tag, responder);
} catch (MailboxException e) {
- session.getLog().info("LSub failed for reference " + referenceName
+ " and pattern " + mailboxPattern, e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("LSub failed for reference " +
referenceName + " and pattern " + mailboxPattern, e);
+ }
final HumanReadableText displayTextKey =
HumanReadableText.GENERIC_LSUB_FAILURE;
no(command, tag, responder, displayTextKey);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/ListProcessor.java
Sat Oct 8 18:14:52 2011
@@ -174,7 +174,9 @@ public class ListProcessor extends Abstr
okComplete(command, tag, responder);
} catch (MailboxException e) {
- session.getLog().info("List failed", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("List failed", e);
+ }
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/LogoutProcessor.java
Sat Oct 8 18:14:52 2011
@@ -44,7 +44,9 @@ public class LogoutProcessor extends Abs
bye(responder);
okComplete(command, tag, responder);
} catch (MailboxException e) {
- session.getLog().info("Logout failed", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Logout failed", e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/RenameProcessor.java
Sat Oct 8 18:14:52 2011
@@ -64,13 +64,19 @@ public class RenameProcessor extends Abs
okComplete(command, tag, responder);
unsolicitedResponses(session, responder, false);
} catch (MailboxExistsException e) {
- session.getLog().debug("Rename from " + existingPath + " to " +
newPath + " failed because the target mailbox exists", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Rename from " + existingPath + " to "
+ newPath + " failed because the target mailbox exists", e);
+ }
no(command, tag, responder,
HumanReadableText.FAILURE_MAILBOX_EXISTS);
} catch (MailboxNotFoundException e) {
- session.getLog().debug("Rename from " + existingPath + " to " +
newPath + " failed because the source mailbox not exists", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Rename from " + existingPath + " to "
+ newPath + " failed because the source mailbox not exists", e);
+ }
no(command, tag, responder, HumanReadableText.MAILBOX_NOT_FOUND);
} catch (MailboxException e) {
- session.getLog().info("Rename from " + existingPath + " to " +
newPath + " failed", e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Rename from " + existingPath + " to " +
newPath + " failed", e);
+ }
no(command, tag, responder,
HumanReadableText.GENERIC_FAILURE_DURING_PROCESSING);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SearchProcessor.java
Sat Oct 8 18:14:52 2011
@@ -197,10 +197,14 @@ public class SearchProcessor extends Abs
unsolicitedResponses(session, responder, omitExpunged, useUids);
okComplete(command, tag, responder);
} catch (MessageRangeException e) {
- session.getLog().debug("Search failed in mailbox " +
session.getSelected().getPath() + " because of an invalid sequence-set ", e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Search failed in mailbox " +
session.getSelected().getPath() + " because of an invalid sequence-set ", e);
+ }
taggedBad(command, tag, responder,
HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- session.getLog().info("Search failed in mailbox " +
session.getSelected().getPath(), e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Search failed in mailbox " +
session.getSelected().getPath(), e);
+ }
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
if (resultOptions.contains(SearchResultOption.SAVE)) {
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StatusProcessor.java
Sat Oct 8 18:14:52 2011
@@ -59,7 +59,7 @@ public class StatusProcessor extends Abs
try {
if (logger != null && logger.isDebugEnabled()) {
- logger.debug("Status called on mailbox named " + mailboxPath +
" (" + mailboxPath + ")");
+ logger.debug("Status called on mailbox named " + mailboxPath);
}
final MailboxManager mailboxManager = getMailboxManager();
@@ -89,7 +89,9 @@ public class StatusProcessor extends Abs
okComplete(command, tag, responder);
} catch (MailboxException e) {
- session.getLog().info("Status failed for mailbox " + mailboxPath,
e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Status failed for mailbox " +
mailboxPath, e);
+ }
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/StoreProcessor.java
Sat Oct 8 18:14:52 2011
@@ -193,10 +193,14 @@ public class StoreProcessor extends Abst
}
} catch (MessageRangeException e) {
- session.getLog().debug("Store failed for mailbox " +
session.getSelected().getPath() + " because of an invalid sequence-set " +
idSet.toString(), e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Store failed for mailbox " +
session.getSelected().getPath() + " because of an invalid sequence-set " +
idSet.toString(), e);
+ }
taggedBad(imapCommand, tag, responder,
HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- session.getLog().info("Store failed for mailbox " +
session.getSelected().getPath(), e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Store failed for mailbox " +
session.getSelected().getPath(), e);
+ }
no(imapCommand, tag, responder, HumanReadableText.SAVE_FAILED);
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SubscribeProcessor.java
Sat Oct 8 18:14:52 2011
@@ -56,7 +56,9 @@ public class SubscribeProcessor extends
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- session.getLog().info("Subscribe failed for mailbox " +
mailboxName, e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Subscribe failed for mailbox " +
mailboxName, e);
+ }
unsolicitedResponses(session, responder, false);
no(command, tag, responder,
HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE);
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/SystemMessageProcessor.java
Sat Oct 8 18:14:52 2011
@@ -53,7 +53,9 @@ public class SystemMessageProcessor exte
}
} catch (MailboxException e) {
final Logger log = session.getLog();
- log.debug("Cannot force logout", e);
+ if (log.isDebugEnabled()) {
+ log.debug("Cannot force logout", e);
+ }
}
}
@@ -68,7 +70,9 @@ public class SystemMessageProcessor exte
private void forceLogout(ImapSession imapSession) throws MailboxException {
final MailboxSession session =
ImapSessionUtils.getMailboxSession(imapSession);
if (session == null) {
- imapSession.getLog().trace("No mailbox session so no force logout
needed");
+ if (imapSession.getLog().isTraceEnabled()) {
+ imapSession.getLog().trace("No mailbox session so no force
logout needed");
+ }
} else {
session.close();
mailboxManager.logout(session, true);
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/UnsubscribeProcessor.java
Sat Oct 8 18:14:52 2011
@@ -56,7 +56,9 @@ public class UnsubscribeProcessor extend
okComplete(command, tag, responder);
} catch (SubscriptionException e) {
- session.getLog().info("Unsubscribe failed for mailbox " +
mailboxName, e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Unsubscribe failed for mailbox " +
mailboxName, e);
+ }
unsolicitedResponses(session, responder, false);
no(command, tag, responder,
HumanReadableText.GENERIC_SUBSCRIPTION_FAILURE);
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/base/SelectedMailboxImpl.java
Sat Oct 8 18:14:52 2011
@@ -229,8 +229,9 @@ public class SelectedMailboxImpl impleme
try {
mailboxManager.removeListener(path, this, mailboxSession);
} catch (MailboxException e) {
- session.getLog().info("Unable to remove listener " + this + " from
mailbox while closing it", e);
-
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Unable to remove listener " + this + "
from mailbox while closing it", e);
+ }
}
}
Modified:
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java?rev=1180444&r1=1180443&r2=1180444&view=diff
==============================================================================
---
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
(original)
+++
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/fetch/FetchProcessor.java
Sat Oct 8 18:14:52 2011
@@ -128,11 +128,14 @@ public class FetchProcessor extends Abst
unsolicitedResponses(session, responder, omitExpunged, useUids);
okComplete(command, tag, responder);
} catch (MessageRangeException e) {
- session.getLog().debug("Fetch failed for mailbox " +
session.getSelected().getPath() + " because of invalid sequence-set " +
idSet.toString(), e);
-
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Fetch failed for mailbox " +
session.getSelected().getPath() + " because of invalid sequence-set " +
idSet.toString(), e);
+ }
taggedBad(command, tag, responder,
HumanReadableText.INVALID_MESSAGESET);
} catch (MailboxException e) {
- session.getLog().info("Fetch failed for mailbox " +
session.getSelected().getPath() + " and sequence-set " + idSet.toString(), e);
+ if (session.getLog().isInfoEnabled()) {
+ session.getLog().info("Fetch failed for mailbox " +
session.getSelected().getPath() + " and sequence-set " + idSet.toString(), e);
+ }
no(command, tag, responder, HumanReadableText.SEARCH_FAILED);
}
}
@@ -166,7 +169,9 @@ public class FetchProcessor extends Abst
} catch (MessageRangeException e) {
// we can't for whatever reason find the message so
// just skip it and log it to debug
- session.getLog().debug("Unable to find message with uid "
+ result.getUid(), e);
+ if (session.getLog().isDebugEnabled()) {
+ session.getLog().debug("Unable to find message with
uid " + result.getUid(), e);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
