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

INT-1069: FIx build (JDK bug in LinkedBlockingQueue)

Browse Source
This commit is contained in:
David Syer
2010-06-18 14:23:51 +00:00
parent c1c8ddc456
commit d4badebb64
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroup.java
View File

@@ -71,8 +71,17 @@ public class SimpleMessageGroup implements MessageGroup {
public SimpleMessageGroup(MessageGroup template) {
this.correlationKey = template.getCorrelationKey();
synchronized (lock) {
this.marked.addAll(template.getMarked());
this.unmarked.addAll(template.getUnmarked());
// Explicit iteration to work around bug in JDK (before 1.6.0_20
for (Message<?> message : template.getMarked()) {
if (message != null) {
this.marked.add(message);
}
}
for (Message<?> message : template.getUnmarked()) {
if (message != null) {
this.unmarked.add(message);
}
}
}
this.timestamp = template.getTimestamp();
}
@@ -155,7 +164,9 @@ public class SimpleMessageGroup implements MessageGroup {
public void markAll() {
synchronized (lock) {
unmarked.drainTo(marked);
marked.addAll(unmarked);
unmarked.clear();
// unmarked.drainTo(marked);
}
}