activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r439941 - in /incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq: ./ store/journal/ thread/ transport/ transport/discovery/simple/ transport/failover/ transport/fanout/ transport/udp/
Date Mon, 04 Sep 2006 05:50:44 GMT
Author: chirino
Date: Sun Sep  3 22:50:43 2006
New Revision: 439941

URL: http://svn.apache.org/viewvc?view=rev&rev=439941
Log:
https://issues.apache.org/activemq/browse/AMQ-891

Modified:
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
    incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java
Sun Sep  3 22:50:43 2006
@@ -1367,6 +1367,7 @@
         try {
             brokerInfoReceived.await();
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw JMSExceptionSupport.create(e);
         }
     }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java
Sun Sep  3 22:50:43 2006
@@ -143,6 +143,7 @@
         try {
             md = unconsumedMessages.dequeue(-1);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw JMSExceptionSupport.create(e);
         }
 

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java
Sun Sep  3 22:50:43 2006
@@ -394,6 +394,7 @@
                 }
             }
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw JMSExceptionSupport.create(e);
         }
     }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java
Sun Sep  3 22:50:43 2006
@@ -1344,6 +1344,7 @@
         try {
             executor.execute(messageDispatch);
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             connection.onAsyncException(e);
         }
     }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java
Sun Sep  3 22:50:43 2006
@@ -114,6 +114,7 @@
                 taskRunner.shutdown();
             }
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw JMSExceptionSupport.create(e);
         }
     }
@@ -156,4 +157,4 @@
 		return messageQueue.removeAll();
 	}
     
-}
\ No newline at end of file
+}

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
Sun Sep  3 22:50:43 2006
@@ -307,6 +307,7 @@
             }
         }
         catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             log.warn("Request to start checkpoint failed: " + e, e);
         }
     }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/store/journal/QuickJournalPersistenceAdapter.java
Sun Sep  3 22:50:43 2006
@@ -306,6 +306,7 @@
             }
         }
         catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             log.warn("Request to start checkpoint failed: " + e, e);
         }
     }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/thread/DedicatedTaskRunner.java
Sun Sep  3 22:50:43 2006
@@ -98,6 +98,7 @@
             
         } catch (InterruptedException e) {
             // Someone really wants this thread to die off.
+            Thread.currentThread().interrupt();
         } finally {
             // Make sure we notify any waiting threads that thread 
             // has terminated.
@@ -107,4 +108,4 @@
             }            
         }
     }
-}
\ No newline at end of file
+}

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/WireFormatNegotiator.java
Sun Sep  3 22:50:43 2006
@@ -81,6 +81,7 @@
             if( !readyCountDownLatch.await(negotiateTimeout, TimeUnit.MILLISECONDS) ) 
             	throw new IOException("Wire format negociation timeout: peer did not send his
wire format.");
         } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             throw new InterruptedIOException();
         }
         super.oneway(command);

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/discovery/simple/SimpleDiscoveryAgent.java
Sun Sep  3 22:50:43 2006
@@ -138,6 +138,7 @@
 		                    	
 		                        sleepMutex.wait(event.reconnectDelay);
 		                    }catch(InterruptedException ie){
+                                Thread.currentThread().interrupt();
 		                       return;
 		                    }
 		                }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/failover/FailoverTransport.java
Sun Sep  3 22:50:43 2006
@@ -112,6 +112,7 @@
                 handleTransportFailure(error);
             }
             catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 transportListener.onException(new InterruptedIOException());
             }
         }
@@ -345,6 +346,7 @@
                                 reconnectMutex.wait(1000);
                             }
                             catch (InterruptedException e) {
+                                Thread.currentThread().interrupt();
                                 log.debug("Interupted: " + e, e);
                             }
                         }
@@ -394,6 +396,7 @@
             }
         }
         catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
             // Some one may be trying to stop our thread.
             throw new InterruptedIOException();
         }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/fanout/FanoutTransport.java
Sun Sep  3 22:50:43 2006
@@ -142,6 +142,7 @@
                 }
             }
             catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
                 transportListener.onException(new InterruptedIOException());
             }
         }        
@@ -394,6 +395,7 @@
             }
         } catch (InterruptedException e) {
             // Some one may be trying to stop our thread.
+            Thread.currentThread().interrupt();
             throw new InterruptedIOException();
         }
     }

Modified: incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
URL: http://svn.apache.org/viewvc/incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java?view=diff&rev=439941&r1=439940&r2=439941
==============================================================================
--- incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
(original)
+++ incubator/activemq/branches/activemq-4.0/activemq-core/src/main/java/org/apache/activemq/transport/udp/UdpTransport.java
Sun Sep  3 22:50:43 2006
@@ -407,6 +407,7 @@
 				try {
 					Thread.sleep(BIND_ATTEMPT_DELAY);
 				} catch (InterruptedException e1) {
+                    Thread.currentThread().interrupt();
 					throw e;
 				}
 			}			



Mime
View raw message