fixes #2850 react only on login handler requests, now supports reloading

svn changeset:7415/svn branch:6.0

diff --git a/src/com/itmill/toolkit/ui/LoginForm.java b/src/com/itmill/toolkit/ui/LoginForm.java
index 06b9de2a7df4f67a3441eb28a6104e7e210224c9..eef64d598e794682b9d10d75633ce07755267108 100644 (file)
--- a/src/com/itmill/toolkit/ui/LoginForm.java
+++ b/src/com/itmill/toolkit/ui/LoginForm.java
@@ -92,14 +92,18 @@ public class LoginForm extends CustomComponent {
                 + "</script></body></html>";
 
         public DownloadStream handleURI(URL context, String relativeUri) {
-            if (window != null) {
-                window.removeURIHandler(this);
+            if (relativeUri != null && relativeUri.contains("loginHandler")) {
+                if (window != null) {
+                    window.removeURIHandler(this);
+                }
+                DownloadStream downloadStream = new DownloadStream(
+                        new ByteArrayInputStream(responce.getBytes()),
+                        "text/html", "loginSuccesfull");
+                downloadStream.setCacheTime(-1);
+                return downloadStream;
+            } else {
+                return null;
             }
-            DownloadStream downloadStream = new DownloadStream(
-                    new ByteArrayInputStream(responce.getBytes()), "text/html",
-                    "loginSuccesfull");
-            downloadStream.setCacheTime(-1);
-            return downloadStream;
         }
     };