Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compatibility with the latest SF

Browse Source 
https://build.spring.io/browse/INT-MJATS41-869

* Revert to `B-S` versions for SA and SF
* Since `MessagingException.toString()` now includes and `failedMessage` as well, a comparision with `TcpConnectionExceptionEvent.toString()` should be a bit different

See https://jira.spring.io/browse/SPR-15091
This commit is contained in:
Artem Bilan
2017-01-06 10:24:17 -05:00
parent f0bf226775
commit e04a8d9948
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSocketFactorySupport.java
View File

@@ -33,7 +33,7 @@ public interface TcpSocketFactorySupport {
/**
* Supplies the {@link ServerSocketFactory} to be used to create new
* {@link ServerSocket}s.
* @return the ServerSocketFacory
* @return the ServerSocketFactory
*/
ServerSocketFactory getServerSocketFactory();

3
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionEventTests.java
View File

@@ -117,7 +117,8 @@ public class ConnectionEventTests {
assertNotNull(theEvent.get(0));
assertTrue(theEvent.get(0) instanceof TcpConnectionExceptionEvent);
assertTrue(theEvent.get(0).toString().endsWith("[factory=foo, connectionId=" + conn.getConnectionId() + "]"));
assertThat(theEvent.get(0).toString(), containsString("RuntimeException: foo]"));
assertThat(theEvent.get(0).toString(),
containsString("RuntimeException: foo, failedMessage=GenericMessage [payload=bar"));
TcpConnectionExceptionEvent event = (TcpConnectionExceptionEvent) theEvent.get(0);
assertNotNull(event.getCause());
assertSame(toBeThrown, event.getCause().getCause());