1 files changed, 20 insertions, 3 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
index 8ee09dc..2f02944 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/LocalRequestHelper.java
@@ -84,7 +84,7 @@ public abstract class LocalRequestHelper
   public static String processLocalSign(SignSessionInformation si, HttpServletRequest request, HttpServletResponse response) throws IOException, PresentableException
   {
     String host = request.getServerName(); // "129.27.153.77"
-    URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");
+    URL loc_ref_URL = new URL(getLocalContextAddress(request, response) + "/RetrieveSignatureData");
     String loc_ref_url = response.encodeURL(loc_ref_URL.toString());
 
     LocalConnector c = ConnectorChooser.chooseLocalConnectorForSign(si.connector, si.type, loc_ref_url);
@@ -175,7 +175,7 @@ public abstract class LocalRequestHelper
 //    si.finished = false;
 
     String host = request.getServerName();
-    URL loc_ref_URL = new URL(request.getScheme(), host, request.getServerPort(), request.getContextPath() + "/RetrieveSignatureData");
+    URL loc_ref_URL = new URL(getLocalContextAddress(request, response) + "/RetrieveSignatureData");
     String loc_ref_url = response.encodeURL(loc_ref_URL.toString());
 
     for (int i = 0; i < si.currentLocalOperation.requests.length; i++)
@@ -414,7 +414,15 @@ public abstract class LocalRequestHelper
     URL local_server = null;
     try
     {
-      local_server = new URL(request.getScheme(), host, request.getServerPort(), "/");
+       String scheme = request.getScheme();
+       int port = request.getServerPort();
+       if ("http".equalsIgnoreCase(scheme) && port == 80) {
+          local_server = new URL(scheme, host, "/");
+       } else if ("https".equalsIgnoreCase(scheme) && port == 443) {
+          local_server = new URL(scheme, host, "/");
+       } else {
+          local_server = new URL(scheme, host, port, "/");
+       }
     }
     catch (MalformedURLException e)
     {
@@ -424,6 +432,15 @@ public abstract class LocalRequestHelper
 
     return loc_server;
   }
+  
+  public static String getLocalContextAddress(HttpServletRequest request, HttpServletResponse response) {
+     String serverURL = getLocalServerAddress(request, response);
+     String context = request.getContextPath();
+     if (serverURL.endsWith("/") && context.startsWith("/")) {
+        context = context.substring(1);
+     }
+     return serverURL + context;
+  }
 
   /**
    * Returns the URL for accessing the local service.