remm 01/06/27 18:21:27
Modified: src/share/org/apache/slide/macro MacroImpl.java
Log:
- in MacroImpl.deleteObject(), ignore the ObjectHasChildrenException if
thrown, as those children exist because something has failed deeper in
the recursion (for example a child might have been locked).
thus a corresponding exception has already been added to the
DeleteMacroException.
Patch submitted by Christopher Lenz <cmlenz at gmx.de>.
Revision Changes Path
1.17 +9 -4 jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- MacroImpl.java 2001/05/16 12:05:15 1.16
+++ MacroImpl.java 2001/06/28 01:21:23 1.17
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.16
2001/05/16 12:05:15 juergen Exp $
- * $Revision: 1.16 $
- * $Date: 2001/05/16 12:05:15 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v 1.17
2001/06/28 01:21:23 remm Exp $
+ * $Revision: 1.17 $
+ * $Date: 2001/06/28 01:21:23 $
*
* ====================================================================
*
@@ -77,7 +77,7 @@
* Macro helper class.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public final class MacroImpl implements Macro {
@@ -470,6 +470,11 @@
structureHelper.remove(token, currentObject);
+ } catch (ObjectHasChildrenException ex) {
+ // ignore, the object has children because something else failed
+ // (one of the children is locked, for example), and the
+ // corresponding exception has already been added the the
+ // MacroException
} catch (SlideException ex) {
e.addException(ex);
}
