You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/02/17 11:30:41 UTC

svn commit: r628470 - /myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java

Author: skitching
Date: Sun Feb 17 02:30:39 2008
New Revision: 628470

URL: http://svn.apache.org/viewvc?rev=628470&view=rev
Log:
Minor tweak: return zero-length array rather than null, to make life easier for callers.

Modified:
    myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java

Modified: myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java?rev=628470&r1=628469&r2=628470&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java (original)
+++ myfaces/orchestra/trunk/core/src/main/java/org/apache/myfaces/orchestra/conversation/ConversationRequestParameterProvider.java Sun Feb 17 02:30:39 2008
@@ -32,6 +32,8 @@
  */
 public class ConversationRequestParameterProvider implements RequestParameterProvider
 {
+	private final static String[] NO_PARAMETERS = new String[0];
+
 	private final static String[] REQUEST_PARAMETERS = new String[]
 		{
 			ConversationManager.CONVERSATION_CONTEXT_PARAM
@@ -94,20 +96,8 @@
 	{
 		if (isInSeparationMode())
 		{
-			return null;
-		}
-
-		/*
-		ConversationManager conversationManager = ConversationManager.getInstance();
-		if (conversationManager == null)
-		{
-			throw new IllegalStateException("can find the conversationManager");
-		}
-		if (!conversationManager.hasConversationContext())
-		{
-			return null;
+			return NO_PARAMETERS;
 		}
-		*/
 
 		return REQUEST_PARAMETERS;
 	}