Author: ningjiang Date: Wed Jan 14 20:25:20 2009 New Revision: 734609 URL: http://svn.apache.org/viewvc?rev=734609&view=rev Log: Merged revisions 734392 via svnmerge from https://svn.apache.org/repos/asf/activemq/camel/trunk
........ r734392 | jstrachan | 2009-01-14 21:43:55 +0800 (Wed, 14 Jan 2009) | 1 line avoided possible IndexOutOfBoundsException mentioned here http://www.nabble.com/Reason-why-Mockendpoint-generates-an-IndexOutOfBoundsException-error---tp21453025s22882p21453025.html ........ Modified: activemq/camel/branches/camel-1.x/ (props changed) activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedHeaderTest.java (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java (props changed) activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml (props changed) Propchange: activemq/camel/branches/camel-1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 14 20:25:20 2009 @@ -1 +1 @@ -/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734422 +/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734392,734422 Propchange: activemq/camel/branches/camel-1.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java URL: http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=734609&r1=734608&r2=734609&view=diff ============================================================================== --- activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original) +++ activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Wed Jan 14 20:25:20 2009 @@ -323,7 +323,10 @@ assertTrue("No exchange received for counter: " + i, exchange != null); Object expectedBody = expectedBodyValues.get(i); - Object actualBody = actualBodyValues.get(i); + Object actualBody = null; + if (i < actualBodyValues.size()) { + actualBody = actualBodyValues.get(i); + } assertEquals("Body of message: " + i, expectedBody, actualBody); } Propchange: activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithStringDelimitedHeaderTest.java ('svn:mergeinfo' removed) Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/java/org/apache/camel/spring/processor/SpringRecipientListWithStringDelimitedHeaderTest.java ('svn:mergeinfo' removed) Propchange: activemq/camel/branches/camel-1.x/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/recipientListWithStringDelimitedHeader.xml ('svn:mergeinfo' removed)
