Merge pull request #2301 from bencaradocdavies/geos-8122-8123-master

[GEOS-8122][GEOS-8123] Fixes for FileUtils.deleteDirectory test failures
geoserver · May 3, 2017 · 52d748a · 52d748a
2 parents 187a337 + 4e4e733
commit 52d748a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/gwc/src/main/java/org/geoserver/gwc/GWC.java b/src/gwc/src/main/java/org/geoserver/gwc/GWC.java
@@ -178,7 +178,7 @@ public class GWC implements DisposableBean, InitializingBean, ApplicationContext
     /**
      * @see #getResponseEncoder(MimeType, RenderedImageMap)
      */
-    private static Map<String, Response> cachedTileEncoders = new HashMap<String, Response>();
+    private Map<String, Response> cachedTileEncoders = new HashMap<String, Response>();
 
     private final TileLayerDispatcher tld;
 

diff --git a/src/main/src/test/java/org/geoserver/test/GeoServerSystemTestSupport.java b/src/main/src/test/java/org/geoserver/test/GeoServerSystemTestSupport.java
@@ -276,7 +276,7 @@ protected void destroyGeoServer() {
         if (applicationContext == null) {
             return;
         }
-
+        getGeoServer().dispose();
         try {
             //dispose WFS XSD schema's - they will otherwise keep geoserver instance alive forever!!
             disposeIfExists(getXSD11());