webwork/src/main/webwork/view/velocity URLBean.java,1.7,1.8

Update of /cvsroot/opensymphony/webwork/src/main/webwork/view/velocity
In directory sc8-pr-cvs1:/tmp/cvs-serv2242/src/main/webwork/view/velocity

Modified Files:
	URLBean.java 
Log Message:
getParameterMap is always unmodifiable, so might as well use putAll

Index: URLBean.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/view/velocity/URLBean.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- URLBean.java	10 Nov 2003 00:07:00 -0000	1.7
+++ URLBean.java	10 Nov 2003 00:52:31 -0000	1.8
@@ -105,7 +105,7 @@
       {
          // No particular page requested, so go to "same page"
          // Add query params to parameters
-         params = request.getParameterMap();
+         params.putAll(request.getParameterMap());
       }
 
       StringBuffer link = new StringBuffer();
@@ -177,15 +177,7 @@
       // Reset params and page
       if(params.size()>0)
       {
-        //if it's non-modifiable, just assign a new map.
-        try
-        {
-          this.params.clear();
-        }
-        catch(UnsupportedOperationException ex)
-        {
-          params = new HashMap();
-        }
+        this.params.clear();
       }
       this.page=null;
       return result;




-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/