Author: michiel
Date: 2009-11-17 14:59:00 +0100 (Tue, 17 Nov 2009)
New Revision: 39738
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
Log:
MMB-1893
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
2009-11-17 13:43:21 UTC (rev 39737)
+++
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
2009-11-17 13:59:00 UTC (rev 39738)
@@ -598,16 +598,9 @@
* @since MMBase-1.8.5
*/
private void deleteRelation(MMObjectNode relation) {
- // first delete Relations to this this relation.
- // SHOULD security not be checked first?
- try {
- for (MMObjectNode subRelation :
BasicCloudContext.mmb.getInsRel().getRelationNodes(relation.getNumber(),
false)) {
- deleteRelation(subRelation);
- }
- } catch (SearchQueryException sqe) {
- log.error(sqe);
- }
- cloud.remove(relation);
+ // leave deletion to cloud
+ // (the cloud may for example be a transaction and can be cancelled)
+ cloud.getNode(relation.getNumber()).delete(true);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
