svn commit: r1513158 - in /tomcat/trunk: java/org/apache/jasper/compiler/TldLocationsCache.java java/org/apache/jasper/servlet/JasperInitializer.java test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java

[markt]

Author: markt
Date: Mon Aug 12 15:07:55 2013
New Revision: 1513158

URL: http://svn.apache.org/r1513158
Log:
Fix some code warnings

Modified:
    tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
    tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
    tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java

Modified: tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java?rev=1513158&r1=1513157&r2=1513158&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TldLocationsCache.java Mon Aug 
12 15:07:55 2013
@@ -21,9 +21,6 @@ import java.util.Map;
 
 import javax.servlet.ServletContext;
 
-import org.apache.jasper.JasperException;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.descriptor.tld.TldResourcePath;
 
 
@@ -64,7 +61,6 @@ public class TldLocationsCache {
 
     public static final String KEY = TldLocationsCache.class.getName();
 
-    private static final Log log = LogFactory.getLog(TldLocationsCache.class);
     private final Hashtable<String, TldLocation> mappings;
 
     public TldLocationsCache(Map<String, TldResourcePath> taglibMap) {
@@ -105,7 +101,7 @@ public class TldLocationsCache {
      * @param uri The taglib uri
      * @return the TldLocation for this uri
      */
-    public TldLocation getLocation(String uri) throws JasperException {
+    public TldLocation getLocation(String uri) {
         return mappings.get(uri);
     }
 }

Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java?rev=1513158&r1=1513157&r2=1513158&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperInitializer.java Mon Aug 
12 15:07:55 2013
@@ -49,7 +49,7 @@ public class JasperInitializer implement
             LOG.debug(Localizer.getMessage(MSG + ".onStartup", 
context.getServletContextName()));
         }
 
-        boolean validate = Boolean.valueOf(context.getInitParameter(VALIDATE));
+        boolean validate = 
Boolean.valueOf(context.getInitParameter(VALIDATE)).booleanValue();
 
         // scan the application for TLDs
         TldScanner scanner = new TldScanner(context, true, validate);

Modified: 
tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java?rev=1513158&r1=1513157&r2=1513158&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java 
(original)
+++ tomcat/trunk/test/org/apache/tomcat/util/descriptor/tld/TestTldParser.java 
Mon Aug 12 15:07:55 2013
@@ -27,7 +27,6 @@ import org.junit.Test;
 import org.xml.sax.SAXException;
 
 public class TestTldParser {
-    private static final String WEBAPP = "test/webapp-3.1/WEB-INF/";
     private TldParser parser;
 
     @Before



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org