You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/06/24 16:19:50 UTC
svn commit: r671180 - in
/myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation:
Conversation.java spring/SpringSingleConversationScope.java
Author: skitching
Date: Tue Jun 24 07:19:49 2008
New Revision: 671180
URL: http://svn.apache.org/viewvc?rev=671180&view=rev
Log:
Remove SpringSingleConversationScope; it is intended for use in "diaglog" systems, and that work is not yet complete.
Removed:
myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/spring/SpringSingleConversationScope.java
Modified:
myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java
Modified: myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java?rev=671180&r1=671179&r2=671180&view=diff
==============================================================================
--- myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java (original)
+++ myfaces/orchestra/branches/prepare_core12/src/main/java/org/apache/myfaces/orchestra/conversation/Conversation.java Tue Jun 24 07:19:49 2008
@@ -21,7 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.orchestra.conversation.spring.SpringSingleConversationScope;
import java.util.Map;
import java.util.TreeMap;
@@ -364,13 +363,6 @@
return conversation.getConversation();
}
- // see if there is a single conversation hanging around in the conversation context
- ConversationContext cctx = ConversationManager.getInstance().getCurrentConversationContext();
- if (cctx != null)
- {
- return cctx.getConversation(SpringSingleConversationScope.CONVERSATION_NAME);
- }
-
return null;
}