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 12:18:12 UTC
svn commit: r1188074 - in /camel/trunk/components/camel-quickfix/src:
main/java/org/apache/camel/component/quickfixj/QuickfixjEngine.java
test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java
Author: ningjiang
Date: Mon Oct 24 10:18:12 2011
New Revision: 1188074
URL: http://svn.apache.org/viewvc?rev=1188074&view=rev
Log:
CAMEL-4568 fixed the test error
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=1188074&r1=1188073&r2=1188074&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:18:12 2011
@@ -326,7 +326,7 @@ public class QuickfixjEngine {
}
private void isJdbcLog(SessionSettings settings, Set<LogFactory> impliedLogFactories) {
- if (settings.isSetting(JdbcSetting.SETTING_JDBC_DRIVER)) {
+ if (impliedLogFactories.size() == 0 && settings.isSetting(JdbcSetting.SETTING_JDBC_DRIVER)) {
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=1188074&r1=1188073&r2=1188074&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:18:12 2011
@@ -247,7 +247,7 @@ public class QuickfixjEngineTest {
settings.setString(sessionID, SessionFactory.SETTING_CONNECTION_TYPE, SessionFactory.INITIATOR_CONNECTION_TYPE);
writeSettings();
-
+
quickfixjEngine = new QuickfixjEngine("quickfix:test", settingsFile.getName(), false);
assertThat(quickfixjEngine.getInitiator(), notNullValue());