From e957eedb959dfd5ea5cbe8e681ae9ff5660f8bb6 Mon Sep 17 00:00:00 2001 From: Musachy Barroso Date: Mon, 10 Aug 2009 22:06:48 +0000 Subject: [PATCH] WW-3155 RestfulActionMapper iterates a map where it should only just do a lookup thanks to Dion Sasmito for patch git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802942 13f79535-47bb-0310-9956-ffa450edef68 --- .../dispatcher/mapper/RestfulActionMapper.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java index 275bd97d2..0eed0cd14 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java +++ b/core/src/main/java/org/apache/struts2/dispatcher/mapper/RestfulActionMapper.java @@ -123,14 +123,11 @@ public class RestfulActionMapper implements ActionMapper { StringBuilder retVal = new StringBuilder(); retVal.append(mapping.getNamespace()); retVal.append(mapping.getName()); - for (Map.Entry 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(); }