myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From skitch...@apache.org
Subject svn commit: r657016 - /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/ContextLockRequestHandler.java
Date Fri, 16 May 2008 10:59:16 GMT
Author: skitching
Date: Fri May 16 03:59:16 2008
New Revision: 657016

URL: http://svn.apache.org/viewvc?rev=657016&view=rev
Log:
Fix theoretical bug in locking when using nested contexts; two requests should be serialized
if they could share any context data, not just if they access the same "leaf" context.

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/ContextLockRequestHandler.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/ContextLockRequestHandler.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/ContextLockRequestHandler.java?rev=657016&r1=657015&r2=657016&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/ContextLockRequestHandler.java
(original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/lib/jsf/ContextLockRequestHandler.java
Fri May 16 03:59:16 2008
@@ -48,11 +48,7 @@
             ConversationManager manager = ConversationManager.getInstance(false);
             if (manager != null)
             {
-                context = manager.getCurrentConversationContext();
-                if (context == null)
-                {
-                    context = manager.getTopmostConversationContext(true);
-                }
+                context = manager.getTopmostConversationContext(true);
                 try
                 {
                     context.lockInterruptablyForCurrentThread();



Mime
View raw message