Updated Branches: refs/heads/master 981c7929d -> 7e53a3c58
CAMEL-6252: camel-aws - Possible concurrent modification exception Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7e53a3c5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7e53a3c5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7e53a3c5 Branch: refs/heads/master Commit: 7e53a3c588511ee8ad72383f80e0bdc6598003f3 Parents: 981c792 Author: cmueller <cmuel...@apache.org> Authored: Thu Jun 27 23:50:21 2013 +0200 Committer: cmueller <cmuel...@apache.org> Committed: Thu Jun 27 23:50:21 2013 +0200 ---------------------------------------------------------------------- .../org/apache/camel/component/aws/s3/AmazonS3ClientMock.java | 5 +++-- .../org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7e53a3c5/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java index 9419b8c..ba9aabe 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/s3/AmazonS3ClientMock.java @@ -22,6 +22,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; @@ -77,8 +78,8 @@ import org.junit.Assert; public class AmazonS3ClientMock extends AmazonS3Client { - List<S3Object> objects = new ArrayList<S3Object>(); - List<PutObjectRequest> putObjectRequests = new ArrayList<PutObjectRequest>(); + List<S3Object> objects = new CopyOnWriteArrayList<S3Object>(); + List<PutObjectRequest> putObjectRequests = new CopyOnWriteArrayList<PutObjectRequest>(); private boolean nonExistingBucketCreated; http://git-wip-us.apache.org/repos/asf/camel/blob/7e53a3c5/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java ---------------------------------------------------------------------- diff --git a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java index 45fee49..ac0838f 100644 --- a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java +++ b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/AmazonSQSClientMock.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.concurrent.CopyOnWriteArrayList; import com.amazonaws.AmazonClientException; import com.amazonaws.AmazonServiceException; @@ -43,7 +44,7 @@ public class AmazonSQSClientMock extends AmazonSQSClient { List<Message> messages = new ArrayList<Message>(); Map<String, Map<String, String>> queueAttributes = new HashMap<String, Map<String, String>>(); - List<ChangeMessageVisibilityRequest> changeMessageVisibilityRequests = new ArrayList<ChangeMessageVisibilityRequest>(); + List<ChangeMessageVisibilityRequest> changeMessageVisibilityRequests = new CopyOnWriteArrayList<ChangeMessageVisibilityRequest>(); public AmazonSQSClientMock() { super(new BasicAWSCredentials("myAccessKey", "mySecretKey"));