svn commit: r483624 - /velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java

[nb...@apache.org]

Author: nbubna
Date: Thu Dec  7 11:26:43 2006
New Revision: 483624

URL: http://svn.apache.org/viewvc?view=rev&rev=483624
Log:
no longer trying to support compiling on Servlet 2.2

Modified:
    velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java

Modified: velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java?view=diff&rev=483624&r1=483623&r2=483624
==============================================================================
--- velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java (original)
+++ velocity/tools/trunk/src/java/org/apache/velocity/tools/view/tools/ParameterParser.java Thu Dec  7 11:26:43 2006
@@ -19,8 +19,6 @@
  * under the License.
  */
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Map;
 import javax.servlet.ServletRequest;
 import org.apache.velocity.tools.generic.ValueParser;
@@ -160,31 +158,11 @@
 
     /**
      * Overrides ValueParser.getSource() to return the result
-     * of getRequest().getParameterMap() if Servlet 2.3 or above
-     * is being used.  Otherwise, this throws an
-     * UnsupportedOperationException, because the class uses a
-     * servlet request as its source, not a Map.
+     * of getRequest().getParameterMap().
      */
     protected Map getSource()
     {
-        try
-        {
-            // use reflection so we can compile against Servlet 2.2
-            Method getmap = ServletRequest.class.getMethod("getParameterMap", null);
-            return (Map)getmap.invoke(getRequest(), null);
-        }
-        catch (NoSuchMethodException nsme)
-        {
-            throw new UnsupportedOperationException("This method is only supported with Servlet 2.3 and higher.");
-        }
-        catch (IllegalAccessException iae)
-        {
-            throw new UnsupportedOperationException("ServletRequest.getParameterMap() is restricted - " + iae);
-        }
-        catch (InvocationTargetException ite)
-        {
-            throw new UnsupportedOperationException("ServletRequest.getParameterMap() threw an exception - " + ite);
-        }
+        return getRequest().getParameterMap();
     }
 
 }