/ - Diff - Metacat - Ecoinformatics Redmine

« Previous | Next »

Revision 4421

use secure server for replication - note that this is WITHOUT "https://" prepended

     	 * @return string holding the server URL
     	 */
     	public static String getSecureServerURL() throws PropertyNotFoundException {
     		String ServerURL = "https://" + PropertyService.getProperty("server.name");
     		String ServerURL = "https://" + getSecureServer();
     		return ServerURL;
+    	}
     	/**
     	 * Get the secure server  which is made up of the server name + : + the
     	 * https port number. Note that if the port is 443, it is left off.
     	 * NOTE: does NOT include "https://"
     	 * @see getSecureServerURL()
+    	 *
     	 * @return string holding the secure server
     	 */
     	public static String getSecureServer() throws PropertyNotFoundException {
     		String server = PropertyService.getProperty("server.name");
     		String httpPort = PropertyService.getProperty("server.httpSSLPort");
     		if (!httpPort.equals("443")) {
     			ServerURL = PropertyService.getProperty("server.name") + ":" + httpPort;
     			server = server + ":" + httpPort;
+    		}
     		return ServerURL;
     		return server;
+    	}
     	/**

             // append "context/servlet/replication" to the host name
             try {
             replicationServerName =
             	SystemUtil.getContextURL() + "/servlet/replication";
             	SystemUtil.getSecureServer() + "/servlet/replication";
             } catch (PropertyNotFoundException pnfe) {
             	logMetacat.error("Could not get local replication server name "
             			+ "because property could not be found: " + pnfe.getMessage());

Also available in: Unified diff