pierred 00/10/23 17:38:00
Modified: jasper/src/share/org/apache/jasper/compiler
ForwardGenerator.java IncludeGenerator.java
Log:
Bug fix: make sure params is not null before checking its size
Revision Changes Path
1.3 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ForwardGenerator.java
Index: ForwardGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ForwardGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ForwardGenerator.java 2000/10/11 19:35:12 1.2
+++ ForwardGenerator.java 2000/10/24 00:37:57 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ForwardGenerator.java,v
1.2 2000/10/11 19:35:12 shemnon Exp $
- * $Revision: 1.2 $
- * $Date: 2000/10/11 19:35:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/ForwardGenerator.java,v
1.3 2000/10/24 00:37:57 pierred Exp $
+ * $Revision: 1.3 $
+ * $Date: 2000/10/24 00:37:57 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
writer.println("out.clear();");
writer.println("String _jspx_qfStr = \"\";");
- if (params.size() > 0) {
+ if (params != null && params.size() > 0) {
Enumeration en = params.keys();
while (en.hasMoreElements()) {
String key = (String) en.nextElement();
1.5 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java
Index: IncludeGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IncludeGenerator.java 2000/10/11 19:35:14 1.4
+++ IncludeGenerator.java 2000/10/24 00:37:58 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
1.4 2000/10/11 19:35:14 shemnon Exp $
- * $Revision: 1.4 $
- * $Date: 2000/10/11 19:35:14 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
1.5 2000/10/24 00:37:58 pierred Exp $
+ * $Revision: 1.5 $
+ * $Date: 2000/10/24 00:37:58 $
*
* ====================================================================
*
@@ -132,7 +132,7 @@
if (flush) {
writer.println("out.flush();");
}
- if (params.size() > 0) {
+ if (params != null && params.size() > 0) {
Enumeration en = params.keys();
while (en.hasMoreElements()) {
String key = (String) en.nextElement();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
