Author: rmannibucau
Date: Mon Dec 29 10:21:02 2014
New Revision: 1648301
URL: http://svn.apache.org/r1648301
Log:
removing conversation with request
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java?rev=1648301&r1=1648300&r2=1648301&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java
Mon Dec 29 10:21:02 2014
@@ -232,7 +232,7 @@ public class ConversationImpl implements
check();
if(!isTransient)
{
- webBeansContext.getConversationManager().removeConversation(this);
+ //
webBeansContext.getConversationManager().removeConversation(this); // needs to
be done after the request, not here
iDontUseItAnymore();
id = null;
isTransient = true;
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=1648301&r1=1648300&r2=1648301&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
Mon Dec 29 10:21:02 2014
@@ -184,7 +184,7 @@ public class ConversationManager
while (it.hasNext())
{
conv = (ConversationImpl) it.next();
- if (conv.getId().equals(conversationId) &&
conv.getSessionId().equals(sessionId))
+ if (conversationId.equals(conv.getId()) &&
conv.getSessionId().equals(sessionId))
{
return conv;
}
Modified:
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java?rev=1648301&r1=1648300&r2=1648301&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
(original)
+++
openwebbeans/trunk/webbeans-web/src/main/java/org/apache/webbeans/web/context/WebContextsService.java
Mon Dec 29 10:21:02 2014
@@ -434,6 +434,7 @@ public class WebContextsService extends
logger.log(Level.FINE, "Destroying the transient conversation
context with cid : [{0}]", conversation.getId());
}
destroyConversationContext();
+ conversationManager.removeConversation(conversation); // in case
end() was called
}
else
{
