- Check when renaming file that name doesn't already exist.

[pithos] / src / gr / ebs / gss / server / Login.java

diff --git a/src/gr/ebs/gss/server/Login.java b/src/gr/ebs/gss/server/Login.java
index cf9fe7a..73c924e 100644 (file)
--- a/src/gr/ebs/gss/server/Login.java
+++ b/src/gr/ebs/gss/server/Login.java
@@ -29,7 +29,8 @@ import gr.ebs.gss.server.ejb.ExternalAPI;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-import java.net.URL;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URLEncoder;
 import java.util.Formatter;
 
@@ -237,8 +238,14 @@ public class Login extends HttpServlet {
                String userEncoded = URLEncoder.encode(user.getUsername(), "US-ASCII");
                if (logger.isDebugEnabled())
                        logger.debug("user: "+userEncoded+" token: "+tokenEncoded);
-               if (nextUrl != null) {
-                       URL next = new URL(nextUrl);
+               if (nextUrl != null && !nextUrl.isEmpty()) {
+                       URI next;
+                       try {
+                               next = new URI(nextUrl);
+                       } catch (URISyntaxException e) {
+                               response.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
+                               return;
+                       }
                        String domain = next.getHost();
                        String path = next.getPath();
                        Cookie cookie = new Cookie(AUTH_COOKIE, userEncoded + COOKIE_SEPARATOR +