Author: markt
Date: Mon Sep 3 22:08:43 2012
New Revision: 1380384
URL: http://svn.apache.org/viewvc?rev=1380384&view=rev
Log:
Suppress some false positives
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1380384&r1=1380383&r2=1380384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Mon Sep 3
22:08:43 2012
@@ -1177,6 +1177,7 @@ class Parser implements TagConstants {
*
* CustomActionScriptlessContent ::= ScriptlessOptionalBody
*/
+ @SuppressWarnings("null") // tagFileInfo can't be null after initial test
private boolean parseCustomTag(Node parent) throws JasperException {
if (reader.peekChar() != '<') {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java?rev=1380384&r1=1380383&r2=1380384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ParserController.java Mon Sep
3 22:08:43 2012
@@ -171,6 +171,7 @@ class ParserController implements TagCon
* @param jarResource The JAR file from which to read the JSP page or tag
file,
* or null if the JSP page or tag file is to be read from the filesystem
*/
+ @SuppressWarnings("null") // jarResource can't be null
private Node.Nodes doParse(String inFileName,
Node parent,
JarResource jarResource)
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1380384&r1=1380383&r2=1380384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Mon Sep
3 22:08:43 2012
@@ -486,6 +486,7 @@ class TagFileProcessor {
* the TagLibraryInfo object associated with this TagInfo
* @return a TagInfo object assembled from the directives in the tag file.
*/
+ @SuppressWarnings("null") // page can't be null
public static TagInfo parseTagFileDirectives(ParserController pc,
String name, String path, JarResource jarResource, TagLibraryInfo
tagLibInfo)
throws JasperException {
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java?rev=1380384&r1=1380383&r2=1380384&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagLibraryInfoImpl.java Mon
Sep 3 22:08:43 2012
@@ -303,6 +303,7 @@ class TagLibraryInfoImpl extends TagLibr
* the name of the TLD entry in the jar file, which is hardcoded to
* META-INF/taglib.tld.
*/
+ @SuppressWarnings("null") // url can't be null
private TldLocation generateTLDLocation(String uri, JspCompilationContext
ctxt)
throws JasperException {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
