/*
 * Copyright 2011 <a href="mailto:lincolnbaxter@gmail.com">Lincoln Baxter, III</a>
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 * 
 *     http://www.apache.org/licenses/LICENSE-2.0
 * 
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.ocpsoft.rewrite.servlet.http.impl;

import java.util.Collections;
import java.util.Enumeration;
import java.util.Map;
import java.util.TreeMap;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;

/**
 * @author Lincoln Baxter, III <lincoln@ocpsoft.com>
 */
public class HttpRewriteWrappedRequest extends HttpServletRequestWrapper
{
   private final Map<String, String[]> modifiableParameters;
   private Map<String, String[]>       allParameters = null;

   /**
    * Create a new request wrapper that will merge additional parameters into the request object without prematurely
    * reading parameters from the original request.
    * 
    * @param request
    * @param additionalParams
    */
   public HttpRewriteWrappedRequest(final HttpServletRequest request, final Map<String, String[]> additionalParams)
   {
      super(request);
      modifiableParameters = new TreeMap<String, String[]>();
      modifiableParameters.putAll(additionalParams);
   }

   @Override
   public String getParameter(final String name)
   {
      String[] strings = getParameterMap().get(name);
      if (strings != null)
      {
         return strings[0];
      }
      return null;
   }

   @Override
   public Map<String, String[]> getParameterMap()
   {
      if (allParameters == null)
      {
         allParameters = new TreeMap<String, String[]>();
         allParameters.putAll(super.getParameterMap());
         allParameters.putAll(modifiableParameters);
      }
      return Collections.unmodifiableMap(allParameters);
   }

   @Override
   public Enumeration<String> getParameterNames()
   {
      return Collections.enumeration(getParameterMap().keySet());
   }

   @Override
   public String[] getParameterValues(final String name)
   {
      return getParameterMap().get(name);
   }
}

@@ -1102,69 +1102,8 @@
 ers;
-%0A   private Map%3CString, String%5B%5D%3E       allParameters = null;
 %0A%0A  
@@ -1900,51 +1900,29 @@
     
-if (allParameters == null)%0A      %7B%0A        
+Map%3CString, String%5B%5D%3E
  all
@@ -1965,35 +1965,32 @@
 ing%5B%5D%3E();%0A      
-   
 allParameters.pu
@@ -2020,19 +2020,16 @@
 Map());%0A
-   
       al
@@ -2070,24 +2070,16 @@
 eters);%0A
-      %7D%0A
       re

Fix for issue where parameters added to the query string are lost during servlet forwards