Author: bvahdat Date: Thu Nov 1 06:46:04 2012 New Revision: 1404475 URL: http://svn.apache.org/viewvc?rev=1404475&view=rev Log: Merged revisions 1404474 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk
........ r1404474 | bvahdat | 2012-11-01 07:41:17 +0100 (Do, 01 Nov 2012) | 1 line CAMEL-5751: excluded the assert failing from time to time on JDK7. ........ Modified: camel/branches/camel-2.10.x/ (props changed) camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1404474 Propchange: camel/branches/camel-2.10.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java?rev=1404475&r1=1404474&r2=1404475&view=diff ============================================================================== --- camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java (original) +++ camel/branches/camel-2.10.x/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjEngineTest.java Thu Nov 1 06:46:04 2012 @@ -588,12 +588,14 @@ public class QuickfixjEngineTest extends assertThat(quickfixjEngine.getLogFactory(), instanceOf(ScreenLogFactory.class)); assertThat(quickfixjEngine.getMessageFactory(), instanceOf(DefaultMessageFactory.class)); - // TODO: just from time to time the following assert fails on JDK 7 - if (!isJava17()) { - MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); - Set<ObjectName> names = mbeanServer.queryNames(new ObjectName("org.quickfixj:type=Connector,role=Acceptor,*"), null); - assertTrue("QFJ mbean should not have been registered", names.isEmpty()); + if (isJava17()) { + // TODO: just from time to time the assert below fails on JDK 7 + return; } + + MBeanServer mbeanServer = ManagementFactory.getPlatformMBeanServer(); + Set<ObjectName> names = mbeanServer.queryNames(new ObjectName("org.quickfixj:type=Connector,role=Acceptor,*"), null); + assertTrue("QFJ mbean should not have been registered", names.isEmpty()); } private void writeSettings() throws IOException {