summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/ui/UI.java
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/ui/UI.java')
-rw-r--r--server/src/com/vaadin/ui/UI.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index e0f984de0d..fc3df8d052 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -192,13 +192,13 @@ public abstract class UI extends AbstractComponentContainer implements
* to an application
*/
public URL getURL() {
- VaadinSession application = getSession();
- if (application == null) {
+ VaadinSession session = getSession();
+ if (session == null) {
return null;
}
try {
- return new URL(application.getURL(), getName() + "/");
+ return new URL(session.getURL(), getName() + "/");
} catch (MalformedURLException e) {
throw new RuntimeException(
"Internal problem getting window URL, please report");
@@ -705,7 +705,8 @@ public abstract class UI extends AbstractComponentContainer implements
*/
public void setSession(VaadinSession session) {
if ((session == null) == (this.session == null)) {
- throw new IllegalStateException("Application has already been set");
+ throw new IllegalStateException(
+ "VaadinSession has already been set");
} else {
if (session == null) {
detach();