diff --git a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java index 9da445c3ad..ad8b351cfe 100644 --- a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java +++ b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlFilter.java @@ -135,7 +135,9 @@ public class ControlFilter implements Filter { offset = requestUri.length(); } if (!GenericValue.getStackTraceAsString().contains("ControlFilterTests") - && !System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests + && !(System.getProperty("java.class.path").contains("--test component=solr") // Allows Solr tests + || System.getProperty("java.class.path").contains("ofbiz --test_ManifestJar.jar") // Allows Solr tests in testIntegration + || System.getProperty("java.class.path").contains("ofbiz.jar")) // Allows Solr tests in testIntegration in 18.12 && SecurityUtil.containsFreemarkerInterpolation(httpRequest, httpResponse, requestUri)) { return; }