merged fix for #6815

svn changeset:18351/svn branch:6.5

diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 5c2769c7567dac05874ed1b1726b5020f06e47fe..f0e9559664d1c97647610794a3cc0eb71e7fd87f 100644 (file)
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -1123,7 +1123,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler,
 
             // focus is restored to the parent window
             parent.focus();
-            
+
             // subwindow is removed from parent
             parent.removeWindow(this);
         }
@@ -1379,7 +1379,7 @@ public class Window extends Panel implements URIHandler, ParameterHandler,
      * @param listener
      */
     public void removeListener(ResizeListener listener) {
-        removeListener(ResizeEvent.class, this);
+        removeListener(ResizeEvent.class, listener);
     }
 
     /**