Files
spring-integration/spring-integration-ip
Gary Russell e8eecc7d8f INT-4183: Add SSL Handshake Timeout for TCP
JIRA: https://jira.spring.io/browse/INT-4183

Previously, this was hard-coded to 30 seconds.

* Fix typos according PR comments

Conflicts:
	spring-integration-ip/src/main/java/org/springframework/integration/ip/config/IpAdapterParserUtils.java
	spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java

* Resolve conflicts for the  `SocketSupportTests` where `ApplicationEventPublisher` isn't `@FunctionalInterface` yet in SF-4.3.x
2016-12-13 18:54:38 -05:00
..