openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gerdo...@apache.org
Subject svn commit: r892589 - in /incubator/openwebbeans/trunk/webbeans-impl/src/main: java/org/apache/webbeans/component/ java/org/apache/webbeans/config/ java/org/apache/webbeans/conversation/ resources/openwebbeans/
Date Sun, 20 Dec 2009 13:20:20 GMT
Author: gerdogdu
Date: Sun Dec 20 13:20:19 2009
New Revision: 892589

URL: http://svn.apache.org/viewvc?rev=892589&view=rev
Log:
[OWB-171] CID during GET requests must be set on UIViewRoot earlier than before render response.thanks
to Sven Linstaedt for pathing

Modified:
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
    incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java?rev=892589&r1=892588&r2=892589&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/ConversationBean.java
Sun Dec 20 13:20:19 2009
@@ -44,7 +44,8 @@
         {
             conversation = ConversationManager.getInstance().getConversation(conversationId,sessionId);
         }
-        else
+        
+        if (conversation == null)
         {
             if(sessionId != null)
             {

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java?rev=892589&r1=892588&r2=892589&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/OWBLogConst.java
Sun Dec 20 13:20:19 2009
@@ -87,8 +87,9 @@
     public final static String INFO_0038 = "INFO_0038"; // Conversation is restored for non-faces
request with cid: [{1}] for view id: [{2}]
     public final static String INFO_0039 = "INFO_0039"; // Conversation is restored for JSF
postback with cid: [{1}] for view id: [{2}]
     public final static String INFO_0040 = "INFO_0040"; // Create new transient conversation
for JSF postback view id : [{1}]
-    public final static String INFO_0041 = "INFO_0041"; // Destroying the conversation context
with cid: [{1}] for view id: [{2}]
-    public final static String INFO_0042 = "INFO_0042"; // Saving conversation with cid:
[{1}] for view id: [{2}]
+    public final static String INFO_0041 = "INFO_0041"; // Destroying the conversation context
with cid: [{0}] for view: [{1}]
+    public final static String INFO_0042 = "INFO_0042"; // Restoring conversation with cid:
[{0}] for view: [{1}]
+    public final static String INFO_0043 = "INFO_0043"; // Creating a new transitional conversation
for view: [{0}]
 
     public final static String WARN_0001 = "WARN_0001"; // No plugins to shutDown.
     public final static String WARN_0002 = "WARN_0002"; // Alternative XML content is wrong.
Child of <alternatives> must be <class>,<stereotype> but found : 

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java?rev=892589&r1=892588&r2=892589&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationManager.java
Sun Dec 20 13:20:19 2009
@@ -144,27 +144,15 @@
     }
 
     /**
-     * Creates new conversation instance.
-     * @return new conversation instance
-     */
-    public Conversation createNewConversationInstance()
-    {
-        Conversation conversation = getConversationInstance();
-
-        return conversation;
-
-    }
-
-    /**
      * Gets conversation instance from conversation bean.
      * @return conversation instance
      */
     @SuppressWarnings("unchecked")
     public Conversation getConversationInstance()
     {
-        BeanManagerImpl beanManager = BeanManagerImpl.getManager();
-        Bean<Conversation> bean = (Bean<Conversation>)beanManager.resolveByType(Conversation.class,
new DefaultLiteral()).iterator().next();
-        Conversation conversation = BeanManagerImpl.getManager().getInstance(bean, beanManager.createCreationalContext(bean));
+    	BeanManager beanManager = BeanManagerImpl.getManager();
+        Bean<Conversation> bean = (Bean<Conversation>)beanManager.getBeans(Conversation.class,
new DefaultLiteral()).iterator().next();
+        Conversation conversation =(Conversation) beanManager.getReference(bean, Conversation.class,
beanManager.createCreationalContext(bean));
 
         return conversation;
     }

Modified: incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties?rev=892589&r1=892588&r2=892589&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
(original)
+++ incubator/openwebbeans/trunk/webbeans-impl/src/main/resources/openwebbeans/Messages.properties
Sun Dec 20 13:20:19 2009
@@ -95,7 +95,8 @@
 INFO_0039 = Conversation is restored for JSF postback with cid: [{0}] for view: [{1}]
 INFO_0040 = Create new transient conversation for JSF postback view id : [{0}]
 INFO_0041 = Destroying the conversation context with cid: [{0}] for view: [{1}]
-INFO_0042 = Saving conversation with cid: [{0}] for view: [{1}]
+INFO_0042 = Restoring conversation with cid: [{0}] for view: [{1}]
+INFO_0043 = Creating a new transitional conversation for view: [{0}]
 
 
 



Mime
View raw message