You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by im...@apache.org on 2007/09/07 13:24:38 UTC
svn commit: r573546 -
/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
Author: imario
Date: Fri Sep 7 04:24:37 2007
New Revision: 573546
URL: http://svn.apache.org/viewvc?rev=573546&view=rev
Log:
avoid NPE
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java?rev=573546&r1=573545&r2=573546&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationContext.java Fri Sep 7 04:24:37 2007
@@ -19,14 +19,14 @@
package org.apache.myfaces.orchestra.conversation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import java.util.Arrays;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
/**
* <p>The ConversationContext handles all conversations within the current context</p>
* <p/>
@@ -243,7 +243,7 @@
(ConversationTimeoutableAspect)
conversation.getAspect(ConversationTimeoutableAspect.class);
- if (timeoutAspect.isTimeoutReached())
+ if (timeoutAspect != null && timeoutAspect.isTimeoutReached())
{
if (log.isDebugEnabled())
{