svn commit: r1061032 - /openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.java

[gerdogdu]

Author: gerdogdu
Date: Wed Jan 19 22:28:43 2011
New Revision: 1061032

URL: http://svn.apache.org/viewvc?rev=1061032&view=rev
Log:
[OWB-517] Conversation Log Improvement and some minor improvements

Modified:
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/conversation/ConversationImpl.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=1061032&r1=1061031&r2=1061032&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
 Wed Jan 19 22:28:43 2011
@@ -92,6 +92,17 @@ public class ConversationImpl implements
     public ConversationImpl(String sessionId)
     {
         Asserts.assertNotNull(sessionId);
+        
+        try
+        {
+            this.timeout = 
Long.parseLong(WebBeansContext.getInstance().getOpenWebBeansConfiguration().
+                    
getProperty(OpenWebBeansConfiguration.CONVERSATION_TIMEOUT_INTERVAL, 
"1800000"));   
+        }
+        catch(NumberFormatException e)
+        {
+            this.timeout = 30 * 60 * 1000;
+        }
+        
         this.sessionId = sessionId;
     }