shawn 01/10/25 16:33:55
Modified: jsptl/src/org/apache/taglibs/jsptl/tag/common
ImportSupport.java
Log:
Minor changes.
Revision Changes Path
1.3 +7 -2
jakarta-taglibs/jsptl/src/org/apache/taglibs/jsptl/tag/common/ImportSupport.java
Index: ImportSupport.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs/jsptl/src/org/apache/taglibs/jsptl/tag/common/ImportSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImportSupport.java 2001/10/25 23:12:57 1.2
+++ ImportSupport.java 2001/10/25 23:33:55 1.3
@@ -188,8 +188,13 @@
try {
// If we exposed a Reader in doStartTag(), close it.
if (varReader != null) {
- r.close();
- pageContext.setAttribute(varReader, oldVarReader);
+ // 'r' can be null if an exception was thrown...
+ if (r != null)
+ r.close();
+ if (oldVarReader != null)
+ pageContext.setAttribute(varReader, oldVarReader);
+ else
+ pageContext.removeAttribute(varReader);
}
} catch (IOException ex) {
// ignore it; close() failed, but there's nothing more we can do
