Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Don't use JDK 1.6 methods. We support JDK 1.5

  • Loading branch information...
commit e188d532832303e90c977ead0880860a2d3c426c 1 parent e59050b
Scott Farquhar authored
View
26 sitemesh/src/main/java/org/sitemesh/config/ConfigurableSiteMeshFilter.java
@@ -7,17 +7,23 @@
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
-import javax.servlet.*;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.ParserConfigurationException;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Enumeration;
-import java.util.logging.Logger;
-import java.io.IOException;
import java.io.File;
+import java.io.IOException;
import java.io.InputStream;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
/**
* A SiteMesh filter that can be dropped in to web.xml, that does not require having to write any Java code.
@@ -231,7 +237,7 @@ protected boolean getAutoReload() {
*/
protected String getConfigFileName() {
String config = configProperties.get(CONFIG_FILE_PARAM);
- if (config == null || config.isEmpty()) {
+ if (config == null || config.length() == 0) {
config = CONFIG_FILE_DEFAULT;
}
return config;
Please sign in to comment.
Something went wrong with that request. Please try again.