logging-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nickwilli...@apache.org
Subject svn commit: r1482118 - /logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
Date Mon, 13 May 2013 21:53:34 GMT
Author: nickwilliams
Date: Mon May 13 21:53:34 2013
New Revision: 1482118

URL: http://svn.apache.org/r1482118
Log:
Per discussion on mailing list, adding parentheses back for clarity.

Modified:
    logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java

Modified: logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java?rev=1482118&r1=1482117&r2=1482118&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
(original)
+++ logging/log4j/log4j2/trunk/core/src/main/java/org/apache/logging/log4j/core/appender/db/jdbc/ColumnConfig.java
Mon May 13 21:53:34 2013
@@ -96,7 +96,7 @@ public final class ColumnConfig {
         final boolean isLiteralValue = literalValue != null && literalValue.length()
> 0;
         final boolean isPattern = pattern != null && pattern.length() > 0;
 
-        if (isEventTimestamp && isLiteralValue || isEventTimestamp && isPattern
|| isLiteralValue && isPattern) {
+        if ((isEventTimestamp && isLiteralValue) || (isEventTimestamp &&
isPattern) || (isLiteralValue && isPattern)) {
             LOGGER.error("The pattern, literal, and isEventTimestamp attributes are mutually
exclusive.");
             return null;
         }



Mime
View raw message