Author: markt
Date: Wed Mar 26 14:45:13 2014
New Revision: 1581871
URL: http://svn.apache.org/r1581871
Log:
Locks should be outside try/finally
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java?rev=1581871&r1=1581870&r2=1581871&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/OrderInterceptor.java
Wed Mar 26 14:45:13 2014
@@ -73,8 +73,8 @@ public class OrderInterceptor extends Ch
for (int i=0; i<destination.length; i++ ) {
try {
int nr = 0;
+ outLock.writeLock().lock();
try {
- outLock.writeLock().lock();
nr = incCounter(destination[i]);
} finally {
outLock.writeLock().unlock();
@@ -103,10 +103,10 @@ public class OrderInterceptor extends Ch
int msgnr =
XByteBuffer.toInt(msg.getMessage().getBytesDirect(),msg.getMessage().getLength()-4);
msg.getMessage().trim(4);
MessageOrder order = new
MessageOrder(msgnr,(ChannelMessage)msg.deepclone());
+ inLock.writeLock().lock();
try {
- inLock.writeLock().lock();
if ( processIncoming(order) )
processLeftOvers(msg.getAddress(),false);
- }finally {
+ } finally {
inLock.writeLock().unlock();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
