Skip to content

Commit 2ed4018

Browse files
committed
Fix for awslabs#47.
1 parent ec0677b commit 2ed4018

File tree

1 file changed

+9
-17
lines changed

1 file changed

+9
-17
lines changed

src/main/java/com/amazon/sqs/javamessaging/SQSSessionCallbackScheduler.java

+9-17
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,20 @@
1414
*/
1515
package com.amazon.sqs.javamessaging;
1616

17-
import java.util.ArrayDeque;
18-
import java.util.ArrayList;
19-
import java.util.Collections;
20-
import java.util.Iterator;
21-
import java.util.List;
22-
import java.util.Map;
23-
import java.util.Set;
24-
25-
import javax.jms.JMSException;
26-
import javax.jms.MessageListener;
27-
import javax.jms.Session;
28-
29-
import org.apache.commons.logging.Log;
30-
import org.apache.commons.logging.LogFactory;
31-
3217
import com.amazon.sqs.javamessaging.SQSMessageConsumerPrefetch.MessageManager;
3318
import com.amazon.sqs.javamessaging.SQSSession.CallbackEntry;
3419
import com.amazon.sqs.javamessaging.acknowledge.AcknowledgeMode;
3520
import com.amazon.sqs.javamessaging.acknowledge.Acknowledger;
3621
import com.amazon.sqs.javamessaging.acknowledge.NegativeAcknowledger;
3722
import com.amazon.sqs.javamessaging.acknowledge.SQSMessageIdentifier;
3823
import com.amazon.sqs.javamessaging.message.SQSMessage;
24+
import org.apache.commons.logging.Log;
25+
import org.apache.commons.logging.LogFactory;
26+
27+
import javax.jms.JMSException;
28+
import javax.jms.MessageListener;
29+
import javax.jms.Session;
30+
import java.util.*;
3931

4032
/**
4133
* Used internally to guarantee serial execution of message processing on
@@ -92,14 +84,14 @@ public void run() {
9284
try {
9385
while (true) {
9486
try {
95-
if (closed) {
87+
if (!session.isRunning() || closed) {
9688
break;
9789
}
9890
synchronized (callbackQueue) {
9991
callbackEntry = callbackQueue.pollFirst();
10092
if (callbackEntry == null) {
10193
try {
102-
callbackQueue.wait();
94+
callbackQueue.wait(2000L);
10395
} catch (InterruptedException e) {
10496
/**
10597
* Will be retried on the next loop, and

0 commit comments

Comments
 (0)