martinc 02/03/11 21:55:08
Modified: src/share/org/apache/struts/taglib/template GetTag.java
InsertTag.java
Log:
Don't use the JSPException constructor which takes a Throwable, since that
is available only in Servlets 2.3, and we want to remain compatible with
Servlets 2.2 for now.
Revision Changes Path
1.12 +7 -7
jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java
Index: GetTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- GetTag.java 11 Mar 2002 04:56:53 -0000 1.11
+++ GetTag.java 12 Mar 2002 05:55:08 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v
1.11 2002/03/11 04:56:53 martinc Exp $
- * $Revision: 1.11 $
- * $Date: 2002/03/11 04:56:53 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/GetTag.java,v
1.12 2002/03/12 05:55:08 martinc Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/03/12 05:55:08 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* it, depending upon the value of the content's direct attribute.
*
* @author David Geary
- * @version $Revision: 1.11 $ $Date: 2002/03/11 04:56:53 $
+ * @version $Revision: 1.12 $ $Date: 2002/03/12 05:55:08 $
*/
public class GetTag extends TagSupport {
@@ -181,7 +181,7 @@
}
catch(IOException ex) {
saveException(ex);
- throw new JspException(ex);
+ throw new JspException(ex.getMessage());
}
}
else {
@@ -191,10 +191,10 @@
pageContext.include(content.toString());
} catch (IOException ex) {
saveException(ex);
- throw new JspException(ex);
+ throw new JspException(ex.getMessage());
} catch(ServletException ex) {
saveException(ex);
- throw new JspException(ex);
+ throw new JspException(ex.getMessage());
}
}
}
1.11 +6 -6
jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java
Index: InsertTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- InsertTag.java 11 Mar 2002 04:56:53 -0000 1.10
+++ InsertTag.java 12 Mar 2002 05:55:08 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v
1.10 2002/03/11 04:56:53 martinc Exp $
- * $Revision: 1.10 $
- * $Date: 2002/03/11 04:56:53 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/template/InsertTag.java,v
1.11 2002/03/12 05:55:08 martinc Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/03/12 05:55:08 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* tags, which are accessed by <template:get> in the template.
*
* @author David Geary
- * @version $Revision: 1.10 $ $Date: 2002/03/11 04:56:53 $
+ * @version $Revision: 1.11 $ $Date: 2002/03/12 05:55:08 $
*/
public class InsertTag extends TagSupport {
@@ -155,10 +155,10 @@
pageContext.include(prefix + template);
} catch (IOException ex) {
saveException(ex);
- throw new JspException(ex);
+ throw new JspException(ex.getMessage());
} catch(ServletException ex) {
saveException(ex);
- throw new JspException(ex);
+ throw new JspException(ex.getMessage());
}
ContentMapStack.pop(pageContext);
return EVAL_PAGE;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
