Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

This commit is contained in:
Purodha 2013-03-07 12:25:45 +00:00
commit 883f7185ea

View File

@ -27,7 +27,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
Hive hive = pac.getHive();
UnixUser unixUser = getPacAdminUser(pac);
String password = PasswordTool.generatePassword();
Processor priProcessor = new CompoundProcessor(
Processor processor = new CompoundProcessor(
createAddUserProc(pacName, unixUser, password),
createSetQuotaProc(pac),
createEtcHostsProc(hive),
@ -39,8 +39,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
createIfUp(pacName),
createHttpdVirtualProc(hive),
createAccountingRulesProc());
WaitingTasksProcessor secProcessor = new WaitingTasksProcessor(priProcessor);
return secProcessor;
return processor;
}
private Processor createAccountingRulesProc() {