henning 2004/05/09 16:51:26
Modified: src/java/org/apache/turbine/services/intake Tag:
TURBINE_2_3_BRANCH IntakeTool.java
Log:
When there is more than one instance of a group and a "removeAll" is
done the "remove" method is called for each of the instances of the
group. If a mutiply instantiated group is the last one to be removed,
it's parameter entries will already have been removed and "getStrings"
returns null, which is not being handled in the code.
Submitted by: Sam Solon <[EMAIL PROTECTED]>
Reviewed by: Henning P. Schmiedehausen <[EMAIL PROTECTED]>
Revision Changes Path
No revision
No revision
1.17.2.3 +7 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java
Index: IntakeTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- IntakeTool.java 27 Feb 2004 05:48:51 -0000 1.17.2.2
+++ IntakeTool.java 9 May 2004 23:51:26 -0000 1.17.2.3
@@ -406,11 +406,14 @@
pp.remove(INTAKE_GRP);
- for (int i = 0; i < groupKeys.length; i++)
+ if (groupKeys != null)
{
- if (!groupKeys[i].equals(group.getGID()))
+ for (int i = 0; i < groupKeys.length; i++)
{
- pp.add(INTAKE_GRP, groupKeys[i]);
+ if (!groupKeys[i].equals(group.getGID()))
+ {
+ pp.add(INTAKE_GRP, groupKeys[i]);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
