diff options
| author | Matti Tahvonen <matti.tahvonen@itmill.com> | 2011-04-18 15:11:50 +0000 |
|---|---|---|
| committer | Matti Tahvonen <matti.tahvonen@itmill.com> | 2011-04-18 15:11:50 +0000 |
| commit | 6d80fd142d10b6ffc84f13b0e4c80ace86d65ea0 (patch) | |
| tree | ba47d44c0289131b78f5d436a5036e4fa187e2ac /src | |
| parent | 65293d856271bf3509e30f6bb68942ee00cb9bce (diff) | |
| download | vaadin-framework-6d80fd142d10b6ffc84f13b0e4c80ace86d65ea0.tar.gz vaadin-framework-6d80fd142d10b6ffc84f13b0e4c80ace86d65ea0.zip | |
fixes #6861, regression from #6772
svn changeset:18364/svn branch:6.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java | 4 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java index 0504e02787..02218f4bc2 100644 --- a/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java @@ -165,9 +165,9 @@ public abstract class AbstractWebApplicationContext implements final String filename = resource.getFilename(); if (filename == null) { - return "APP/" + mapKey + "/"; + return "app://APP/" + mapKey + "/"; } else { - return "APP/" + mapKey + "/" + filename; + return "app://APP/" + mapKey + "/" + filename; } } diff --git a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java index 080ff33af5..8b1e776b4c 100644 --- a/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java @@ -371,7 +371,7 @@ public class JsonPaintTarget implements PaintTarget { "Application not specified for resorce " + value.getClass().getName()); } - final String uri = "app://" + a.getRelativeLocation(r); + final String uri = a.getRelativeLocation(r); addAttribute(name, uri); } else if (value instanceof ThemeResource) { |