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

INT-2323

Browse Source 
made changes based on Sonar suggestions

added optional rome dependency to HTTP module
This commit is contained in:
Oleg Zhurakousky
2011-12-20 10:08:27 -05:00
committed by Mark Fisher
parent 49482dd0db
commit a44d150009
9 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java
View File

@@ -81,8 +81,12 @@ public class UnicastingDispatcher extends AbstractDispatcher {
public void setLoadBalancingStrategy(LoadBalancingStrategy loadBalancingStrategy) {
Lock lock = rwLock.writeLock();
lock.lock();
this.loadBalancingStrategy = loadBalancingStrategy;
lock.unlock();
try {
this.loadBalancingStrategy = loadBalancingStrategy;
}
finally {
lock.unlock();
}
}
public final boolean dispatch(final Message<?> message) {

4
spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java
View File

@@ -243,10 +243,10 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement
if (error != null) {
if (this.errorChannel != null) {
Message<?> errorMessage = null;
Message<?> errorMessage = new ErrorMessage(error);
Message<?> errorFlowReply = null;
try {
errorFlowReply = this.messagingTemplate.sendAndReceive(this.errorChannel, new ErrorMessage(error));
errorFlowReply = this.messagingTemplate.sendAndReceive(this.errorChannel, errorMessage);
}
catch (Exception errorFlowFailure) {
throw new MessagingException(errorMessage, "failure occurred in error-handling flow", errorFlowFailure);

10
spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStoreReaper.java
View File

@@ -132,11 +132,13 @@ public class MessageGroupStoreReaper implements Runnable, DisposableBean, Initia
destroy();
if (logger.isInfoEnabled()){
logger.info("stopped " + this);
};
} catch (Exception e) {
logger.error("failed to stop bean",e);
} finally {
}
running = false;
}
catch (Exception e) {
logger.error("failed to stop bean",e);
}
finally {
this.lifecycleLock.unlock();
}
}

6
spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java
View File

@@ -497,13 +497,11 @@ public class MessagingMethodInvokerHelper<T> extends AbstractExpressionEvaluator
sb.append(this.determineHeaderExpression(headerAnnotation, new MethodParameter(method, i)));
}
}
else if (parameterTypeDescriptor != null
&& parameterTypeDescriptor.isAssignableTo(messageTypeDescriptor)) {
else if (parameterTypeDescriptor.isAssignableTo(messageTypeDescriptor)) {
sb.append("message");
this.setExclusiveTargetParameterType(parameterTypeDescriptor);
}
else if (parameterTypeDescriptor != null
&& (parameterTypeDescriptor.isAssignableTo(messageListTypeDescriptor) || parameterTypeDescriptor
else if ((parameterTypeDescriptor.isAssignableTo(messageListTypeDescriptor) || parameterTypeDescriptor
.isAssignableTo(messageArrayTypeDescriptor))) {
sb.append("messages");
this.setExclusiveTargetParameterType(parameterTypeDescriptor);