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/03/03 13:40:52 UTC
svn commit: r514142 - in
/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation:
ConversationContext.java ConversationUtils.java
Author: imario
Date: Sat Mar 3 04:40:51 2007
New Revision: 514142
URL: http://svn.apache.org/viewvc?view=rev&rev=514142
Log:
fixed NPE, added ConversationUtils.invalidateIfExists
Modified:
myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationContext.java
myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationUtils.java
Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationContext.java?view=diff&rev=514142&r1=514141&r2=514142
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationContext.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationContext.java Sat Mar 3 04:40:51 2007
@@ -173,7 +173,10 @@
touch();
Conversation conv = (Conversation) conversations.get(name);
- conv.touch();
+ if (conv != null)
+ {
+ conv.touch();
+ }
return conv;
}
Modified: myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationUtils.java
URL: http://svn.apache.org/viewvc/myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationUtils.java?view=diff&rev=514142&r1=514141&r2=514142
==============================================================================
--- myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationUtils.java (original)
+++ myfaces/fusion/trunk/core/src/main/java/org/apache/myfaces/fusion/conversation/ConversationUtils.java Sat Mar 3 04:40:51 2007
@@ -78,4 +78,16 @@
}
}
}
+
+ /**
+ * invalidates a conversation if it exists
+ */
+ public static void invalidateIfExists(String name)
+ {
+ Conversation conversation = ConversationManager.getInstance().getConversation(name);
+ if (conversation != null)
+ {
+ conversation.invalidate();
+ }
+ }
}