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

Fix Race Condition in Test Interceptor (TCP)

Browse Source 
The HelloWorldInterceptor (server side) set the
negotiated flag after sending the handshake back.
The next message could be received before the flag
was set and caused the test to fail.

Synchronize the server-side handshaking code so that
we don't start processing the next message before
the negotiated flag is set.

Leave the diagnostic log settings in place for now.
This commit is contained in:
Gary Russell
2015-02-12 16:44:16 -05:00
parent 7e8ad682f2
commit b7d64d12da
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java
View File

@@ -61,36 +61,45 @@ public class HelloWorldInterceptor extends TcpConnectionInterceptorSupport {
@Override
public boolean onMessage(Message<?> message) {
if (!this.negotiated) {
Object payload = message.getPayload();
if (this.isServer()) {
if (payload.equals(hello)) {
try {
logger.debug(this.toString() + " sending " + this.world);
super.send(MessageBuilder.withPayload(world).build());
this.negotiated = true;
return true;
} catch (Exception e) {
throw new MessagingException("Negotiation error", e);
synchronized(this) {
if (!this.negotiated) {
Object payload = message.getPayload();
logger.debug(this.toString() + " received " + payload);
if (this.isServer()) {
if (payload.equals(hello)) {
try {
logger.debug(this.toString() + " sending " + this.world);
super.send(MessageBuilder.withPayload(world).build());
this.negotiated = true;
return true;
}
catch (Exception e) {
throw new MessagingException("Negotiation error", e);
}
}
else {
throw new MessagingException("Negotiation error, expected '" + hello +
"' received '" + payload + "'");
}
}
else {
if (payload.equals(world)) {
this.negotiated = true;
this.negotiationSemaphore.release();
}
else {
throw new MessagingException("Negotiation error - expected '" + world +
"' received " + payload);
}
return true;
}
} else {
throw new MessagingException("Negotiation error, expected '" + hello +
"' received '" + payload + "'");
}
} else {
logger.debug(this.toString() + " received " + payload);
if (payload.equals(world)) {
this.negotiated = true;
this.negotiationSemaphore.release();
} else {
throw new MessagingException("Negotiation error - expected '" + world +
"' received " + payload);
}
return true;
}
}
try {
return super.onMessage(message);
} finally {
}
finally {
// on the server side, we don't want to close if we are expecting a response
if (!(this.isServer() && this.hasRealSender()) && !this.pendingSend) {
this.checkDeferredClose();
@@ -113,7 +122,8 @@ public class HelloWorldInterceptor extends TcpConnectionInterceptorSupport {
}
}
super.send(message);
} finally {
}
finally {
this.pendingSend = false;
this.checkDeferredClose();
}