You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/10/24 11:53:26 UTC
svn commit: r1188070 -
/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
Author: ningjiang
Date: Mon Oct 24 09:53:26 2011
New Revision: 1188070
URL: http://svn.apache.org/viewvc?rev=1188070&view=rev
Log:
CAMEL-4568 camel-quickfix should throw exception if the user configure the JdbcDriver and SLF4jLog together
Modified:
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
Modified: camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java?rev=1188070&r1=1188069&r2=1188070&view=diff
==============================================================================
--- camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java (original)
+++ camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java Mon Oct 24 09:53:26 2011
@@ -295,8 +295,8 @@ public class QuickfixjEngine {
Set<LogFactory> impliedLogFactories = new HashSet<LogFactory>();
isFileLog(settings, impliedLogFactories);
isScreenLog(settings, impliedLogFactories);
- isJdbcLog(settings, impliedLogFactories);
isSL4JLog(settings, impliedLogFactories);
+ isJdbcLog(settings, impliedLogFactories);
if (impliedLogFactories.size() > 1) {
throw new ConfigError("Ambiguous log factory implied in configuration");
}
@@ -326,19 +326,17 @@ public class QuickfixjEngine {
}
private void isJdbcLog(SessionSettings settings, Set<LogFactory> impliedLogFactories) {
- if (impliedLogFactories.size() == 0 && settings.isSetting(JdbcSetting.SETTING_JDBC_DRIVER)) {
+ if (settings.isSetting(JdbcSetting.SETTING_JDBC_DRIVER)) {
impliedLogFactories.add(new JdbcLogFactory(settings));
}
}
private void isSL4JLog(SessionSettings settings, Set<LogFactory> impliedLogFactories) {
- if (impliedLogFactories.size() == 0) {
- for (Object key : settings.getDefaultProperties().keySet()) {
- if (key.toString().startsWith("SLF4J")) {
- impliedLogFactories.add(new SLF4JLogFactory(settings));
- return;
- }
- }
+ for (Object key : settings.getDefaultProperties().keySet()) {
+ if (key.toString().startsWith("SLF4J")) {
+ impliedLogFactories.add(new SLF4JLogFactory(settings));
+ return;
+ }
}
}