You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/12/16 22:38:33 UTC
svn commit: r1215296 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces:
application/NavigationHandlerImpl.java
context/servlet/ServletExternalContextImpl.java
Author: lu4242
Date: Fri Dec 16 21:38:33 2011
New Revision: 1215296
URL: http://svn.apache.org/viewvc?rev=1215296&view=rev
Log:
MYFACES-3425 [perf] enhance code applying best practices
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=1215296&r1=1215295&r2=1215296&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java Fri Dec 16 21:38:33 2011
@@ -258,8 +258,10 @@ public class NavigationHandlerImpl
if (navigationCase == null)
{
// Wildcard match?
- for (String fromViewId : getSortedWildcardKeys())
+ List<String> sortedWildcardKeys = getSortedWildcardKeys();
+ for (int i = 0; i < sortedWildcardKeys.size(); i++)
{
+ String fromViewId = sortedWildcardKeys.get(i);
if (fromViewId.length() > 2)
{
String prefix = fromViewId.substring(0, fromViewId.length() - 1);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java?rev=1215296&r1=1215295&r2=1215296&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/ServletExternalContextImpl.java Fri Dec 16 21:38:33 2011
@@ -723,7 +723,7 @@ public final class ServletExternalContex
String fragment = null;
String queryString = null;
- Map<String, List<String>> paramMap = new HashMap<String, List<String>>();
+ Map<String, List<String>> paramMap = null;
//extract any URL fragment
int index = baseUrl.indexOf(URL_FRAGMENT_SEPERATOR);
@@ -757,6 +757,10 @@ public final class ServletExternalContex
throw new UnsupportedOperationException("Encoding type=" + getResponseCharacterEncoding()
+ " not supported", e);
}
+ if (paramMap == null)
+ {
+ paramMap = new HashMap<String, List<String>>();
+ }
paramMap.put(currentPair[0], value);
}
}
@@ -768,6 +772,10 @@ public final class ServletExternalContex
{
if (pair.getKey() != null && pair.getKey().trim().length() != 0)
{
+ if (paramMap == null)
+ {
+ paramMap = new HashMap<String, List<String>>();
+ }
paramMap.put(pair.getKey(), pair.getValue());
}
}
@@ -777,7 +785,7 @@ public final class ServletExternalContex
StringBuilder newUrl = new StringBuilder(baseUrl);
//now add the updated param list onto the url
- if (paramMap.size()>0)
+ if (paramMap != null && paramMap.size()>0)
{
boolean isFirstPair = true;
for (Map.Entry<String, List<String>> pair : paramMap.entrySet())