GEOS-8271 SLD files other catalog implementations (fix JMS)

geoserver · Jun 20, 2018 · 37bba8a · 37bba8a
1 parent 90c8d8f
commit 37bba8a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/...jms-cluster/jms-geoserver/src/main/java/org/geoserver/config/ReadOnlyGeoServerLoader.java b/...jms-cluster/jms-geoserver/src/main/java/org/geoserver/config/ReadOnlyGeoServerLoader.java
@@ -70,9 +70,9 @@ public synchronized void enable(boolean enabled) {
         this.enabled = enabled;
         if (enabled) {
             // remove Default persister
-            if (persister != null) {
+            if (configPersister != null) {
-                geoserver.removeListener(persister);
+                geoserver.removeListener(configPersister);
-                persister = null;
+                configPersister = null;
             }
             // remove Default listener
             if (listener != null) {
@@ -87,10 +87,11 @@ public synchronized void enable(boolean enabled) {
                 listener = new ServicePersister(loaders, geoserver);
                 geoserver.addListener(listener);
             }
-            if (persister == null) {
+            if (configPersister == null) {
-                persister = new GeoServerPersister(resourceLoader, xpf.createXMLPersister());
+                configPersister =
+                        new GeoServerConfigPersister(resourceLoader, xpf.createXMLPersister());
                 // attach back the persister
-                geoserver.addListener(persister);
+                geoserver.addListener(configPersister);
             }
         }
     }

diff --git a/...ster/jms-geoserver/src/test/java/org/geoserver/cluster/integration/GeoServerInstance.java b/...ster/jms-geoserver/src/test/java/org/geoserver/cluster/integration/GeoServerInstance.java
@@ -14,9 +14,10 @@
 import org.geoserver.cluster.events.ToggleType;
 import org.geoserver.cluster.impl.rest.Controller;
 import org.geoserver.config.GeoServer;
+import org.geoserver.config.GeoServerConfigPersister;
 import org.geoserver.config.GeoServerDataDirectory;
 import org.geoserver.config.GeoServerLoader;
-import org.geoserver.config.GeoServerPersister;
+import org.geoserver.config.GeoServerResourcePersister;
 import org.geoserver.config.util.XStreamPersister;
 import org.geoserver.config.util.XStreamPersisterFactory;
 import org.geoserver.data.test.SystemTestData;
@@ -89,8 +90,10 @@ private static void addDefaultStyles(File dataDirectory) throws IOException {
         Catalog catalog = new CatalogImpl();
         catalog.setResourceLoader(loader);
         XStreamPersister xstreamPersister = new XStreamPersisterFactory().createXMLPersister();
-        GeoServerPersister geoserverPersister = new GeoServerPersister(loader, xstreamPersister);
+        GeoServerConfigPersister geoserverPersister =
+                new GeoServerConfigPersister(loader, xstreamPersister);
         catalog.addListener(geoserverPersister);
+        catalog.addListener(new GeoServerResourcePersister(loader));
         // create default styles
         createDefaultStyle(catalog, stylesDirectory, "point", "default_point.sld");
         createDefaultStyle(catalog, stylesDirectory, "line", "default_line.sld");