[Yanel-commits] rev 30433 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2008-01-16 12:21:19 +0100 (Wed, 16 Jan 2008)
New Revision: 30433

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
thanks to Evaldas access control is now also working if SSL is not supported

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-01-16 11:11:33 UTC (rev 30432)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-01-16 11:21:19 UTC (rev 30433)
@@ -1151,7 +1151,9 @@
 	    } else {
                 log.warn("Authentication was successful!");
                 URL url = new URL(getRequestURLQS(request, null, false).toString());
-                url = new URL("https", url.getHost(), new Integer(sslPort).intValue(), url.getFile());
+                if (sslPort != null) {
+                    url = new URL("https", url.getHost(), new Integer(sslPort).intValue(), url.getFile());
+                }
                 log.warn("Redirect to original request: " + url);
                 response.setHeader("Location", url.toString());
                 // TODO: Yulup has a bug re TEMPORARY_REDIRECT