svn commit: r802942 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java

[musachy]

Author: musachy
Date: Mon Aug 10 22:06:48 2009
New Revision: 802942

URL: http://svn.apache.org/viewvc?rev=802942&view=rev
Log:
WW-3155 RestfulActionMapper iterates a map where it should only just do a lookup

thanks to Dion Sasmito for patch

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java?rev=802942&r1=802941&r2=802942&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java
 Mon Aug 10 22:06:48 2009
@@ -123,14 +123,11 @@
         StringBuilder retVal = new StringBuilder();
         retVal.append(mapping.getNamespace());
         retVal.append(mapping.getName());
-        for (Map.Entry<String, Object> entry : mapping.getParams().entrySet()) 
{
-            String name = entry.getKey();
-            if (name.equals(mapping.getName() + "Id")) {
-                retVal.append("/");
-                retVal.append(entry.getValue());
-                break;
-            }
-        }
+        Object value = mapping.getParams().get(mapping.getName() + "Id");
+        if (value != null) {
+            retVal.append("/");
+            retVal.append(value);
+        } 
 
         return retVal.toString();
     }