You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/10 00:08:18 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake IntakeTool.java
henning 2003/04/09 15:08:18
Modified: src/java/org/apache/turbine/services/intake IntakeTool.java
Log:
Make the intake tool more robust when passing null to the remove() method.
Revision Changes Path
1.16 +22 -19 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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- IntakeTool.java 19 Mar 2003 14:19:15 -0000 1.15
+++ IntakeTool.java 9 Apr 2003 22:08:17 -0000 1.16
@@ -426,29 +426,32 @@
*/
public void remove(Group group)
{
- groups.remove(group.getObjectKey());
- group.removeFromRequest();
+ if (group != null)
+ {
+ groups.remove(group.getObjectKey());
+ group.removeFromRequest();
- String[] groupKeys = pp.getStrings(INTAKE_GRP);
+ String[] groupKeys = pp.getStrings(INTAKE_GRP);
- pp.remove(INTAKE_GRP);
+ pp.remove(INTAKE_GRP);
- for (int i = 0; i < groupKeys.length; i++)
- {
- 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]);
+ }
+ }
+
+ try
+ {
+ TurbineIntake.releaseGroup(group);
+ }
+ catch (TurbineException se)
+ {
+ log.error("Tried to release unknown group "
+ + group.getIntakeGroupName());
}
- }
-
- try
- {
- TurbineIntake.releaseGroup(group);
- }
- catch (TurbineException se)
- {
- log.error("Tried to release unknown group "
- + group.getIntakeGroupName());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org