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

SimpleDispatcher no longer wraps a MessagingException inside of a MessageDeliveryException (part of INT-337).

Browse Source
This commit is contained in:
Mark Fisher
2008-08-18 19:04:46 +00:00
parent 4834c8a1b4
commit b4701c0150
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest-context.xml → org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTests-context.xml
View File

8
org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTest.java → org.springframework.integration.security/src/test/java/org/springframework/integration/security/endpoint/EndpointSecurityIntegrationTests.java
View File

@@ -24,7 +24,7 @@ import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.integration.channel.MessageChannel;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.MessagingException;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.security.SecurityTestUtil;
import org.springframework.security.AccessDeniedException;
@@ -39,7 +39,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
* @author Mark Fisher
*/
@ContextConfiguration
public class EndpointSecurityIntegrationTest extends AbstractJUnit4SpringContextTests {
public class EndpointSecurityIntegrationTests extends AbstractJUnit4SpringContextTests {
@Autowired
@Qualifier("input")
@@ -73,8 +73,8 @@ public class EndpointSecurityIntegrationTest extends AbstractJUnit4SpringContext
try {
input.send(new StringMessage("test"));
}
catch (MessageDeliveryException e) {
throw e.getCause().getCause();
catch (MessagingException e) {
throw e.getCause();
}
}

11
org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java
View File

@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Iterator;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageDeliveryException;
import org.springframework.integration.message.MessageHandlingException;
import org.springframework.integration.message.MessageRejectedException;
import org.springframework.integration.message.MessageTarget;
@@ -100,13 +99,13 @@ public class SimpleDispatcher extends AbstractDispatcher {
attempts++;
}
if (this.shouldFailOnRejectionLimit) {
throw new MessageDeliveryException(message, "Dispatcher reached rejection limit of " + this.rejectionLimit, lastException);
throw lastException;
}
return false;
}
private MessageHandlingException sendMessageToFirstAcceptingTarget(Message<?> message, Iterator<MessageTarget> iter) {
MessageHandlingException lastException = null;
MessageHandlingException exception = null;
int count = 0;
int rejectedExceptionCount = 0;
while (iter.hasNext()) {
@@ -127,7 +126,9 @@ public class SimpleDispatcher extends AbstractDispatcher {
}
}
catch (MessageHandlingException e) {
lastException = e;
if (exception == null) {
exception = e;
}
if (logger.isDebugEnabled()) {
logger.debug("Target '" + target + "' threw an exception, continuing with other targets if available.", e);
}
@@ -136,7 +137,7 @@ public class SimpleDispatcher extends AbstractDispatcher {
if (rejectedExceptionCount == count) {
throw new MessageRejectedException(message, "All of dispatcher's targets rejected Message.");
}
return lastException;
return exception;
}
private void waitBetweenAttempts(int attempts) throws InterruptedException {