Author: ningjiang
Date: Mon Oct 24 10:37:42 2011
New Revision: 1188085
URL: http://svn.apache.org/viewvc?rev=1188085&view=rev
Log:
CAMEL-4568 polish the code
Modified:
camel/trunk/components/camel-quickfix/src/main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.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=1188085&r1=1188084&r2=1188085&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 10:37:42 2011
@@ -326,7 +326,7 @@ 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) &&
settings.isSetting(JdbcSetting.SETTING_LOG_EVENT_TABLE)) {
impliedLogFactories.add(new JdbcLogFactory(settings));
}
}
Modified:
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java?rev=1188085&r1=1188084&r2=1188085&view=diff
==============================================================================
---
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
(original)
+++
camel/trunk/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
Mon Oct 24 10:37:42 2011
@@ -215,7 +215,10 @@ public class QuickfixjEngineTest {
@Test
public void inferJdbcStoreAndLog() throws Exception {
+ // If there is a setting of the LOG_EVENT_TABLE, we should create a
jdbcLogFactory for it
settings.setString(JdbcSetting.SETTING_JDBC_DRIVER, "driver");
+ settings.setString(JdbcSetting.SETTING_LOG_EVENT_TABLE, "table");
+
settings.setString(sessionID, SessionFactory.SETTING_CONNECTION_TYPE,
SessionFactory.INITIATOR_CONNECTION_TYPE);
writeSettings();