Merge commit '49973354b22e8aba9cc71f83571020b0414c54e0'

Conflicts:
	shared/ivy.xml

Change-Id: I2aa7cc35953fdc7441d1a5b15a7bf0a34a97db7f

1 files changed, 5 insertions, 9 deletions

diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index 194c9c88a9..42cf479c56 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -16,6 +16,8 @@
 
 package com.vaadin.server;
 
+import static com.vaadin.shared.util.SharedUtil.trimTrailingSlashes;
+
 import java.io.File;
 import java.io.InputStream;
 import java.net.URL;
@@ -80,9 +82,8 @@ public class VaadinPortletService extends VaadinService {
     }
 
     private static String getPortalProperty(VaadinRequest request,
-            String portalParameterVaadinWidgetset) {
-        return ((VaadinPortletRequest) request)
-                .getPortalProperty(portalParameterVaadinWidgetset);
+            String propertyName) {
+        return ((VaadinPortletRequest) request).getPortalProperty(propertyName);
     }
 
     @Override
@@ -139,12 +140,7 @@ public class VaadinPortletService extends VaadinService {
         String staticFileLocation = getPortalProperty(request,
                 Constants.PORTAL_PARAMETER_VAADIN_RESOURCE_PATH);
         if (staticFileLocation != null) {
-            // remove trailing slash if any
-            while (staticFileLocation.endsWith(".")) {
-                staticFileLocation = staticFileLocation.substring(0,
-                        staticFileLocation.length() - 1);
-            }
-            return staticFileLocation;
+            return trimTrailingSlashes(staticFileLocation);
         } else {
             // default for Liferay
             return "/html";