svn commit: r1158564 - /wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java

[mgrigorov]

Author: mgrigorov
Date: Wed Aug 17 08:17:30 2011
New Revision: 1158564

URL: http://svn.apache.org/viewvc?rev=1158564&view=rev
Log:
WICKET-3969 Add CDI integration

Don't check the propagation again. It is known that it is ALL.


Modified:
    
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java

Modified: 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java?rev=1158564&r1=1158563&r2=1158564&view=diff
==============================================================================
--- 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
 (original)
+++ 
wicket/trunk/wicket-weld/src/main/java/org/apache/wicket/cdi/ConversationPropagator.java
 Wed Aug 17 08:17:30 2011
@@ -124,7 +124,7 @@ public class ConversationPropagator exte
                        // propagate cid to a scheduled bookmarkable page
 
                        PageParameters parameters = getPageParameters(handler);
-                       if (parameters != null && propagation == 
ConversationPropagation.ALL)
+                       if (parameters != null)
                        {
                                parameters.add(CID, conversation.getId());
                        }