Skip to content

Commit

Permalink
Compare Kind references before checking log levels
Browse files Browse the repository at this point in the history
Assuming reference comparisons are much quicker than checking
likely-nested logger levels, perform the former first.

Also, since the reference can match only one of the instances,
use "else if" to short-circuit the search.
  • Loading branch information
dharkness authored and philwebb committed Mar 13, 2013
1 parent 12db873 commit 801f196
Showing 1 changed file with 11 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -51,36 +51,32 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
public boolean handleMessage(IMessage message) throws AbortException {
Kind messageKind = message.getKind();

if (LOGGER.isDebugEnabled() || LOGGER.isTraceEnabled()) {
if (messageKind == IMessage.DEBUG) {
if (messageKind == IMessage.DEBUG) {
if (LOGGER.isDebugEnabled() || LOGGER.isTraceEnabled()) {
LOGGER.debug(makeMessageFor(message));
return true;
}
}

if (LOGGER.isInfoEnabled()) {
if ((messageKind == IMessage.INFO) || (messageKind == IMessage.WEAVEINFO)) {
else if ((messageKind == IMessage.INFO) || (messageKind == IMessage.WEAVEINFO)) {
if (LOGGER.isInfoEnabled()) {
LOGGER.info(makeMessageFor(message));
return true;
}
}

if (LOGGER.isWarnEnabled()) {
if (messageKind == IMessage.WARNING) {
else if (messageKind == IMessage.WARNING) {
if (LOGGER.isWarnEnabled()) {
LOGGER.warn(makeMessageFor(message));
return true;
}
}

if (LOGGER.isErrorEnabled()) {
if (messageKind == IMessage.ERROR) {
else if (messageKind == IMessage.ERROR) {
if (LOGGER.isErrorEnabled()) {
LOGGER.error(makeMessageFor(message));
return true;
}
}

if (LOGGER.isFatalEnabled()) {
if (messageKind == IMessage.ABORT) {
else if (messageKind == IMessage.ABORT) {
if (LOGGER.isFatalEnabled()) {
LOGGER.fatal(makeMessageFor(message));
return true;
}
Expand Down

0 comments on commit 801f196

Please sign in to comment.