You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2006/03/17 10:15:40 UTC
svn commit: r386586 - in
/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq:
ActiveMQQueueBrowser.java transport/tcp/ResponseHolder.java
Author: jstrachan
Date: Fri Mar 17 01:15:38 2006
New Revision: 386586
URL: http://svn.apache.org/viewcvs?rev=386586&view=rev
Log:
fix for AMQ-627 to always catch and deal with interupted exceptions
Modified:
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java?rev=386586&r1=386585&r2=386586&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java Fri Mar 17 01:15:38 2006
@@ -229,10 +229,12 @@
*/
protected void waitForMessage() {
try {
- synchronized (semaphore ) {
+ synchronized (semaphore) {
semaphore.wait(2000);
}
- } catch (InterruptedException e) {
+ }
+ catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
}
}
Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java?rev=386586&r1=386585&r2=386586&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ResponseHolder.java Fri Mar 17 01:15:38 2006
@@ -69,7 +69,7 @@
lock.wait(timeout);
}
catch (InterruptedException e) {
- e.printStackTrace();
+ Thread.currentThread().interrupt();
}
}
}