Author: hlship
Date: Wed Sep 14 17:29:24 2011
New Revision: 1170722

URL: http://svn.apache.org/viewvc?rev=1170722&view=rev
Log:
TAP5-1647: Move the call to lock.lock() outside the try ... finally block, as 
per documentation on ReentrantLock

Modified:
    
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
    
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java

Modified: 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java?rev=1170722&r1=1170721&r2=1170722&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/PerThreadOperationTracker.java
 Wed Sep 14 17:29:24 2011
@@ -46,10 +46,10 @@ public class PerThreadOperationTracker i
 
     OperationTracker get()
     {
+        lock.lock();
+
         try
         {
-            lock.lock();
-
             return perThread.get();
         } finally
         {

Modified: 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java?rev=1170722&r1=1170721&r2=1170722&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
 (original)
+++ 
tapestry/tapestry5/trunk/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/PerthreadManagerImpl.java
 Wed Sep 14 17:29:24 2011
@@ -58,10 +58,10 @@ public class PerthreadManagerImpl implem
 
     private Map getPerthreadMap()
     {
+        lock.lock();
+
         try
         {
-            lock.lock();
-
             return holder.get();
         } finally
         {


Reply via email to