You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2010/09/22 03:17:26 UTC
svn commit: r999713 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/SynapseConfigUtils.java startup/quartz/SimpleQuartz.java
Author: ruwan
Date: Wed Sep 22 01:17:26 2010
New Revision: 999713
URL: http://svn.apache.org/viewvc?rev=999713&view=rev
Log:
Fixing the singleton fix issues
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java?rev=999713&r1=999712&r2=999713&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/SynapseConfigUtils.java Wed Sep 22 01:17:26 2010
@@ -58,6 +58,7 @@ import java.util.List;
import java.util.ArrayList;
+@SuppressWarnings({"UnusedDeclaration"})
public class SynapseConfigUtils {
private static final Log log = LogFactory.getLog(SynapseConfigUtils.class);
@@ -336,10 +337,12 @@ public class SynapseConfigUtils {
}
/**
- * Helper method to create a HttpSURLCOnnection with provided KeyStores
+ * Helper method to create a HttpSURLConnection with provided KeyStores
*
* @param url Https URL
- * @return
+ * @param synapseProperties properties for extracting info
+ * @param proxy if there is a proxy
+ * @return gives out the connection created
*/
private static HttpsURLConnection getHttpsURLConnection(
URL url, Properties synapseProperties, Proxy proxy) {
@@ -644,6 +647,7 @@ public class SynapseConfigUtils {
}
if (parentLocation == null) {
+ assert importUri != null;
return importUri.toString();
} else {
// if the import-uri is absolute
@@ -674,6 +678,7 @@ public class SynapseConfigUtils {
handleException("Invalid URI ' " + resolvedPath + " '", e);
}
} else {
+ assert importUri != null;
return importUri.toString();
}
}
@@ -722,19 +727,6 @@ public class SynapseConfigUtils {
return "";
}
- public static String getServerName() {
- // TODO SUPUN
- /*ServerManager serverManager = ServerManager.getInstance();
- if (serverManager.isInitialized()) {
- ServerConfigurationInformation information =
- serverManager.getServerConfigurationInformation();
- if (information != null) {
- return information.getServerName();
- }
- }*/
- return "";
- }
-
public static String getResolveRoot() {
//TODO SUPUN
/*ServerManager serverManager = ServerManager.getInstance();
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java?rev=999713&r1=999712&r2=999713&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/startup/quartz/SimpleQuartz.java Wed Sep 22 01:17:26 2010
@@ -22,7 +22,6 @@ package org.apache.synapse.startup.quart
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.synapse.SynapseException;
-import org.apache.synapse.config.SynapseConfigUtils;
import org.apache.synapse.core.SynapseEnvironment;
import org.apache.synapse.startup.AbstractStartup;
import org.apache.synapse.task.*;
@@ -103,11 +102,12 @@ public class SimpleQuartz extends Abstra
// this server name given by system property SynapseServerName
// otherwise take host-name
// else assume localhost
- String thisServerName = SynapseConfigUtils.getServerName();
+ String thisServerName = synapseEnvironment.getServerContextInformation()
+ .getServerConfigurationInformation().getServerName();
if (thisServerName == null || thisServerName.equals("")) {
try {
- InetAddress addr = InetAddress.getLocalHost();
- thisServerName = addr.getHostName();
+ InetAddress address = InetAddress.getLocalHost();
+ thisServerName = address.getHostName();
} catch (UnknownHostException e) {
log.warn("Could not get the host name", e);