Commit c4796e2a authored by Pete Matern's avatar Pete Matern Committed by pete

Change to CacheFactory.shutdown to no op when clustering isn't enabled.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@8156 b35dd754-fafc-0310-a699-88a17e54d16e
parent bb447f15
...@@ -237,8 +237,16 @@ public class CacheFactory { ...@@ -237,8 +237,16 @@ public class CacheFactory {
* If clustering is not enabled, this method will do nothing. * If clustering is not enabled, this method will do nothing.
*/ */
public static synchronized void shutdown() { public static synchronized void shutdown() {
Log.debug("Shutting down clustered cache service."); if (!clusteringEnabled) {
stopClustering(); return;
}
// See if clustering should be enabled.
String enabled = JiveGlobals.getXMLProperty(CLUSTER_PROPERTY_NAME);
if (Boolean.valueOf(enabled)) {
Log.debug("Shutting down clustered cache service.");
stopClustering();
}
} }
public static void addClusteringListener(ClusteringListener listener) { public static void addClusteringListener(ClusteringListener listener) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment