From ff76f1bf5938909856d43988ddb9890d0105a50e Mon Sep 17 00:00:00 2001 From: Peter Hormanns Date: Wed, 6 Mar 2013 12:39:40 +0100 Subject: [PATCH] pac.delete remove domains before users --- hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java index 4bdaca8..cc1623e 100644 --- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java +++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java @@ -81,16 +81,16 @@ public class PacProcessorFactory implements EntityProcessorFactory { public Processor createDeleteProcessor(EntityManager em, T entity) throws ProcessorException { Pac pac = (Pac) entity; Hive hive = pac.getHive(); - WaitingTasksProcessor waitingProcessor = new WaitingTasksProcessor(new CompoundProcessor( + WaitingTasksProcessor waiting = new WaitingTasksProcessor(createDelUserProc(pac.getName())); + waiting.appendProcessor(pac.getHiveName(), new CompoundProcessor( createIfDown(pac.getName()), createEtcHostsProc(hive), createNetworkInterfacesProc(hive), createSudouersProc(hive), createProftpdConfProc(hive), createHttpdVirtualProc(hive), - createAccountingRulesProc())); - waitingProcessor.appendProcessor(pac.getHiveName(), createDelUserProc(pac.getName()), "remove packet"); - return waitingProcessor; + createAccountingRulesProc()), "remove packet"); + return waiting; } private Processor createEtcHostsProc(Hive hive) throws ProcessorException {