Commit 92e43380 authored by Andrea Aime's avatar Andrea Aime
Browse files

Fixing build

parent 71ec7fba
......@@ -121,7 +121,7 @@ public class SecuredGridCoverage2DReader extends DecoratingGridCoverage2DReader
replacedOriginalFilter = true;
ParameterValue pvalue = (ParameterValue) pv;
Filter originalFilter = (Filter) pvalue.getValue();
if (Filter.INCLUDE.equals(originalFilter)) {
if (originalFilter == null || Filter.INCLUDE.equals(originalFilter)) {
pvalue.setValue(readFilter);
} else {
Filter combined = Predicates.and(originalFilter, readFilter);
......
......@@ -12,13 +12,10 @@ import static org.junit.Assert.assertTrue;
import java.awt.image.BufferedImage;
import java.awt.image.RenderedImage;
import java.io.File;
import java.io.FileOutputStream;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
......@@ -140,34 +137,6 @@ public class ResourceAccessManagerWMSTest extends WMSTestSupport {
prepare();
}
// /**
// * Add the users
// */
// @Override
// protected void populateDataDirectory(MockData dataDirectory) throws Exception {
// super.populateDataDirectory(dataDirectory);
//
// // add a mosaic as well
// URL style = MockData.class.getResource("raster.sld");
// dataDirectory.addStyle("raster", style);
// dataDirectory.addCoverageFromZip(new QName(MockData.SF_URI, "mosaic", MockData.SF_PREFIX),
// MockData.class.getResource("raster-filter-test.zip"), null, "raster");
//
//
// File security = new File(dataDirectory.getDataDirectoryRoot(), "security");
// security.mkdir();
//
// File users = new File(security, "users.properties");
// Properties props = new Properties();
// props.put("admin", "geoserver,ROLE_ADMINISTRATOR");
// props.put("cite", "cite,ROLE_DUMMY");
// props.put("cite_nostates", "cite,ROLE_DUMMY");
// props.put("cite_noinfo", "cite,ROLE_DUMMY");
// props.put("cite_texas", "cite,ROLE_DUMMY");
// props.put("cite_mosaic1", "cite,ROLE_DUMMY");
// props.put("cite_mosaic2", "cite,ROLE_DUMMY");
// props.store(new FileOutputStream(users), "");
// }
public void prepare() throws Exception {
......
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