svn commit: r1535270 - /ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java

[adrianc]

Author: adrianc
Date: Thu Oct 24 02:45:47 2013
New Revision: 1535270

URL: http://svn.apache.org/r1535270
Log:
Simplified some code in OfbizUrlTransform.java.

Modified:
    ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java

Modified: 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java?rev=1535270&r1=1535269&r2=1535270&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java 
(original)
+++ 
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/ftl/OfbizUrlTransform.java 
Thu Oct 24 02:45:47 2013
@@ -121,29 +121,25 @@ public class OfbizUrlTransform implement
                         return;
                     }
                     HttpServletRequest request = 
FreeMarkerWorker.unwrap(env.getVariable("request"));
-                    Delegator delegator = 
FreeMarkerWorker.unwrap(env.getVariable("delegator"));
-                    if (request != null && delegator == null) {
-                        delegator = (Delegator) 
request.getAttribute("delegator");
-                    }
                     // Handle web site ID.
                     if (!webSiteId.isEmpty()) {
+                        Delegator delegator = 
FreeMarkerWorker.unwrap(env.getVariable("delegator"));
+                        if (request != null && delegator == null) {
+                            delegator = (Delegator) 
request.getAttribute("delegator");
+                        }
                         if (delegator == null) {
                             throw new IllegalStateException("Delegator not 
found");
                         }
-                        for (WebappInfo webAppInfo : 
ComponentConfig.getAllWebappResourceInfos()) {
-                            if 
(webSiteId.equals(WebAppUtil.getWebSiteId(webAppInfo))) {
-                                StringBuilder newUrlBuff = new 
StringBuilder(250);
-                                OfbizUrlBuilder builder = 
OfbizUrlBuilder.from(webAppInfo, delegator);
-                                builder.buildFullUrl(newUrlBuff, 
buf.toString(), secure);
-                                String newUrl = newUrlBuff.toString();
-                                if (encode) {
-                                    newUrl = URLEncoder.encode(newUrl, 
"UTF-8");
-                                }
-                                out.write(newUrl);
-                                return;
-                            }
+                        WebappInfo webAppInfo = 
WebAppUtil.getWebappInfoFromWebsiteId(webSiteId);
+                        StringBuilder newUrlBuff = new StringBuilder(250);
+                        OfbizUrlBuilder builder = 
OfbizUrlBuilder.from(webAppInfo, delegator);
+                        builder.buildFullUrl(newUrlBuff, buf.toString(), 
secure);
+                        String newUrl = newUrlBuff.toString();
+                        if (encode) {
+                            newUrl = URLEncoder.encode(newUrl, "UTF-8");
                         }
-                        throw new IllegalArgumentException("Web site ID '" + 
webSiteId + "' not found.");
+                        out.write(newUrl);
+                        return;
                     }
                     if (request != null) {
                         ServletContext ctx = (ServletContext) 
request.getAttribute("servletContext");