INT-3982: Fix XSD declaration ambiguity

JIRA: https://jira.spring.io/browse/INT-3982

Also fix some sporadic, timing issues in tests
This commit is contained in:
Artem Bilan
2016-04-18 21:04:20 -04:00
parent 9e092d44f7
commit 818387f0a4
4 changed files with 13 additions and 21 deletions

View File

@@ -72,7 +72,8 @@ public class ConnectionFactoryShutDownTests {
watch.start();
factory.stop();
watch.stop();
assertTrue("Expected < 1000, was:" + watch.getLastTaskTimeMillis(), watch.getLastTaskTimeMillis() < 1000);
assertTrue("Expected < 10000, was:" + watch.getLastTaskTimeMillis(), watch.getLastTaskTimeMillis() < 10000);
assertTrue(latch1.await(10, TimeUnit.SECONDS));
}
}