Author: markt
Date: Mon Sep 3 21:58:37 2012
New Revision: 1380382
URL: http://svn.apache.org/viewvc?rev=1380382&view=rev
Log:
reader can't be null here
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java?rev=1380382&r1=1380381&r2=1380382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspReader.java Mon Sep 3
21:58:37 2012
@@ -532,14 +532,12 @@ class JspReader {
int fileid = registerSourceFile(longName);
if (fileid == -1) {
- // Bugzilla 37407:
http://issues.apache.org/bugzilla/show_bug.cgi?id=37407
- if(reader != null) {
- try {
- reader.close();
- } catch (Exception any) {
- if(log.isDebugEnabled()) {
- log.debug("Exception closing reader: ", any);
- }
+ // http://issues.apache.org/bugzilla/show_bug.cgi?id=37407
+ try {
+ reader.close();
+ } catch (Exception any) {
+ if(log.isDebugEnabled()) {
+ log.debug("Exception closing reader: ", any);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
