diff options
| author | Artur Signell <artur@vaadin.com> | 2012-09-25 09:12:11 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-09-25 09:12:11 +0300 |
| commit | 0c2096c4eb6e52dc08b60eced771bb008d219664 (patch) | |
| tree | 8597430bf1fbd56dadfd081e2891cfb7a47546ff | |
| parent | 6544f598f554e6801c63920e3c6cbabf0f091c50 (diff) | |
| download | vaadin-framework-0c2096c4eb6e52dc08b60eced771bb008d219664.tar.gz vaadin-framework-0c2096c4eb6e52dc08b60eced771bb008d219664.zip | |
Portlet resource URLs are now portlet specific instead of global (#9730)
| -rw-r--r-- | server/src/com/vaadin/server/PortletCommunicationManager.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/server/src/com/vaadin/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java index 938bd2927d..8636c7e6e1 100644 --- a/server/src/com/vaadin/server/PortletCommunicationManager.java +++ b/server/src/com/vaadin/server/PortletCommunicationManager.java @@ -98,12 +98,6 @@ public class PortletCommunicationManager extends AbstractCommunicationManager { */ JSONObject defaults = super.getDefaultParameters(context); - ResourceURL portletResourceUrl = getRenderResponse(context) - .createResourceURL(); - portletResourceUrl.setResourceID(VaadinPortlet.RESOURCE_URL_ID); - defaults.put(ApplicationConstants.PORTLET_RESOUCE_URL_BASE, - portletResourceUrl.toString()); - defaults.put("pathInfo", ""); return defaults; @@ -131,8 +125,7 @@ public class PortletCommunicationManager extends AbstractCommunicationManager { @Override protected String getMainDivStyle(BootstrapContext context) { - VaadinService vaadinService = context.getRequest() - .getService(); + VaadinService vaadinService = context.getRequest().getService(); return vaadinService.getDeploymentConfiguration() .getApplicationOrSystemProperty( VaadinPortlet.PORTLET_PARAMETER_STYLE, null); @@ -150,6 +143,13 @@ public class PortletCommunicationManager extends AbstractCommunicationManager { ResourceURL resourceURL = portletResponse.createResourceURL(); resourceURL.setResourceID("browserDetails"); parameters.put("browserDetailsUrl", resourceURL.toString()); + + ResourceURL portletResourceUrl = getRenderResponse(context) + .createResourceURL(); + portletResourceUrl.setResourceID(VaadinPortlet.RESOURCE_URL_ID); + parameters.put(ApplicationConstants.PORTLET_RESOUCE_URL_BASE, + portletResourceUrl.toString()); + return parameters; } |