epugh 2004/05/13 04:12:22
Modified: src/java/org/apache/turbine/services/intake 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.
Revision Changes Path
1.20 +11 -7
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- IntakeTool.java 14 Oct 2003 12:17:24 -0000 1.19
+++ IntakeTool.java 13 May 2004 11:12:22 -0000 1.20
@@ -451,13 +451,17 @@
pp.remove(INTAKE_GRP);
- for (int i = 0; i < groupKeys.length; i++)
- {
- if (!groupKeys[i].equals(group.getGID()))
- {
- pp.add(INTAKE_GRP, groupKeys[i]);
+ if (groupKeys != null)
+ {
+ for (int i = 0; i < groupKeys.length; i++)
+ {
+ if (!groupKeys[i].equals(group.getGID()))
+ {
+ pp.add(INTAKE_GRP, groupKeys[i]);
+ }
}
- }
+ }
+
try
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
