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

INT-1072: Resolved ConcurrentModificationException in MessageHistory and improved equality testing

Browse Source
This commit is contained in:
Iwein Fuld
2010-04-09 08:47:41 +00:00
parent 892eb1ad5c
commit d0caad8f4d
4 changed files with 39 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
org.springframework.integration/src/main/java/org/springframework/integration/history/MessageHistory.java
View File

@@ -16,88 +16,61 @@
package org.springframework.integration.history;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.springframework.integration.support.ComponentMetadata;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue;
/**
* Iterable list of {@link MessageHistoryEvent} instances.
*
* Threadsafe Iterable list of {@link MessageHistoryEvent} instances.
*
* @author Mark Fisher
* @author Oleg Zhurakousky
* @author Iwein Fuld
* @since 2.0
*/
@SuppressWarnings("serial")
public class MessageHistory implements Iterable<MessageHistoryEvent>, Serializable {
private final List<MessageHistoryEvent> events = new ArrayList<MessageHistoryEvent>();
private final ReadWriteLock lock = new ReentrantReadWriteLock();
private final Queue<MessageHistoryEvent> events = new ConcurrentLinkedQueue<MessageHistoryEvent>();
/**
* Add a new event with the provided component metadata.
*/
public MessageHistoryEvent addEvent(ComponentMetadata metadata) {
if (metadata != null && metadata.getComponentName() != null) {
try {
this.lock.writeLock().lock();
MessageHistoryEvent event = new MessageHistoryEvent(metadata);
this.events.add(event);
return event;
}
finally {
this.lock.writeLock().unlock();
}
}
return null;
}
public MessageHistoryEvent addEvent(ComponentMetadata metadata) {
if (metadata != null && metadata.getComponentName() != null) {
MessageHistoryEvent event = new MessageHistoryEvent(metadata);
this.events.add(event);
return event;
}
return null;
}
/**
* Returns an iterator for an unmodifiable list of the history events.
*/
public Iterator<MessageHistoryEvent> iterator() {
try {
this.lock.readLock().lock();
return Collections.unmodifiableList(this.events).iterator();
}
finally {
this.lock.readLock().unlock();
}
}
/**
* Returns a weakly consistent iterator that will never throw
* ConcurrentModificationException as in {@link java.util.concurrent.ConcurrentLinkedQueue#iterator()}.
*/
public Iterator<MessageHistoryEvent> iterator() {
return this.events.iterator();
}
public boolean equals(Object other) {
return (other instanceof MessageHistory
&& this.events.equals(((MessageHistory) other).events));
&& this.events.containsAll(((MessageHistory) other).events))
&& ((MessageHistory) other).events.containsAll(this.events);
}
public int hashCode() {
try {
this.lock.readLock().lock();
return 17 * this.events.hashCode();
}
finally {
this.lock.readLock().unlock();
}
return 17 * this.events.hashCode();
}
/**
* Returns a String representation of the history event list.
*/
public String toString() {
try {
this.lock.readLock().lock();
return this.events.toString();
}
finally {
this.lock.readLock().unlock();
}
}
return new ArrayList<MessageHistoryEvent>(events).toString();
}
}

2
org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java
View File

@@ -60,7 +60,7 @@ public class MethodInvokingMessageGroupProcessorTests {
return result;
}
public String know() {
public String know(List<Integer> flags) {
return "I'm not the one ";
}
}

7
org.springframework.integration/src/test/java/org/springframework/integration/history/MessageHistoryTests.java
View File

@@ -15,13 +15,13 @@
*/
package org.springframework.integration.history;
import org.junit.Test;
import org.springframework.integration.support.ComponentMetadata;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.springframework.integration.support.ComponentMetadata;
/**
* @author Oleg Zhurakousky
* @since 2.0
@@ -29,6 +29,7 @@ import org.springframework.integration.support.ComponentMetadata;
public class MessageHistoryTests {
private long times = 1000;
private ExecutorService executor = Executors.newCachedThreadPool();
@Test
public void testConcurrentModificationsOnObjectMethods() throws Exception{
final MessageHistory history = new MessageHistory();

6
org.springframework.integration/src/test/java/org/springframework/integration/json/InboundJsonMessageMapperTests.java
View File

@@ -16,7 +16,9 @@
package org.springframework.integration.json;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.io.IOException;
@@ -50,8 +52,8 @@ public class InboundJsonMessageMapperTests {
String jsonMessage = "{\"headers\":{\"$timestamp\":1,\"$id\":\"" + id + "\"},\"payload\":\"myPayloadStuff\"}";
Message<String> expected = MessageBuilder.withPayload("myPayloadStuff").setHeader(MessageHeaders.TIMESTAMP, new Long(1)).setHeader(MessageHeaders.ID, id).build();
InboundJsonMessageMapper mapper = new InboundJsonMessageMapper(String.class);
Message<?> result = mapper.toMessage(jsonMessage);
assertEquals(expected, result);
Message<String> result = (Message<String>) mapper.toMessage(jsonMessage);
assertThat(result, is(expected));
}
@Test