From d61cd790fe819d9ba3db9c20a1bf652778623326 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 25 Jul 2018 13:27:05 -0400 Subject: [PATCH] Upgrade to Gradle 4.9; fix RotatingServersTests Stop the flow before examining the stream to avoid `ConcurrentModificationException`. **cherry-pick to 5.0.x** --- gradle/wrapper/gradle-wrapper.jar | Bin 54413 -> 54413 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../ftp/inbound/RotatingServersTests.java | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 91ca28c8b802289c3a438766657a5e98f20eff03..0d4a9516871afd710a9d84d89e31ba77745607bd 100644 GIT binary patch delta 66 zcmeBO$=th=d4f61&s)=~CR#_ZMSd#!Sj0H_V5;=SErEx)H?uGVc(Zd sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 1, 2, 2, 2, 3, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1); File f1 = new File(tmpDir + File.separator + "standard" + File.separator + "f1"); @@ -113,6 +115,7 @@ public class RotatingServersTests extends FtpTestSupport { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(FairConfig.class); StandardConfig config = ctx.getBean(StandardConfig.class); assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + ctx.getBean(StandardIntegrationFlow.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1, 2, 2, 3); File f1 = new File(tmpDir + File.separator + "fair" + File.separator + "f1"); @@ -130,6 +133,7 @@ public class RotatingServersTests extends FtpTestSupport { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(VariableLocalConfig.class); StandardConfig config = ctx.getBean(StandardConfig.class); assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); + ctx.getBean(StandardIntegrationFlow.class).stop(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); assertThat(sfCalls).containsExactly(1, 1, 1, 2, 2, 2, 3, 3, 3, 1, 1, 2, 2, 3, 3, 1, 1); File f1 = new File(tmpDir + File.separator + "variable" + File.separator + "foo" + File.separator + "f1"); @@ -146,6 +150,7 @@ public class RotatingServersTests extends FtpTestSupport { public void testStreaming() throws Exception { AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext(StreamingConfig.class); StandardConfig config = ctx.getBean(StandardConfig.class); + ctx.getBean(StandardIntegrationFlow.class).stop(); assertThat(config.latch.await(10, TimeUnit.SECONDS)).isTrue(); List sfCalls = config.sessionSources.stream().limit(17).collect(Collectors.toList()); // there's an extra getSession() with this adapter in listFiles