[weld-commits] Weld SVN: r6072 - core/trunk/impl/src/main/java/org/jboss/weld/conversation.

[weld-commits at lists.jboss.org]

Author: nickarls
Date: 2010-04-01 03:13:36 -0400 (Thu, 01 Apr 2010)
New Revision: 6072

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java
Log:
Only apply the timeout parameter in the init method if it's currently unset (0) locally

Modified: core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java	2010-04-01 06:48:18 UTC (rev 6071)
+++ core/trunk/impl/src/main/java/org/jboss/weld/conversation/ConversationImpl.java	2010-04-01 07:13:36 UTC (rev 6072)
@@ -94,7 +94,8 @@
    }
 
    /**
-    * Initializes a new conversation
+    * Initializes a new conversation. The timeout value is only applied if
+    * the local value is currently unset (0).
     * 
     * @param conversationIdGenerator The conversation ID generator
     * @param timeout The conversation inactivity timeout
@@ -102,7 +103,10 @@
    @Inject
    public void init(@ConversationInactivityTimeout long timeout)
    {
-      this.timeout = timeout;
+      if (this.timeout == 0) 
+      {
+         this.timeout = timeout;
+      }
       _transient = true;
    }