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/08/30 09:22:12 UTC
svn commit: r571058 - in
/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation:
FlashManager.java jsf/ConversationPhaseListener.java
Author: imario
Date: Thu Aug 30 00:21:57 2007
New Revision: 571058
URL: http://svn.apache.org/viewvc?rev=571058&view=rev
Log:
avoid NPEs if there is no FlashScopeManagerConfiguration configured
Removed:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/FlashManager.java
Modified:
myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java
Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java?rev=571058&r1=571057&r2=571058&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/ConversationPhaseListener.java Thu Aug 30 00:21:57 2007
@@ -65,10 +65,13 @@
return;
}
- Set ignoredViewIds = flashManager.getFlashScopeManagerConfiguration().getIgnoreViewIds();
- if (ignoredViewIds.contains(viewId))
+ if (flashManager.getFlashScopeManagerConfiguration() != null)
{
- return;
+ Set ignoredViewIds = flashManager.getFlashScopeManagerConfiguration().getIgnoreViewIds();
+ if (ignoredViewIds != null && ignoredViewIds.contains(viewId))
+ {
+ return;
+ }
}
ConversationManager conversationManager = ConversationManager.getInstance();