//
// This file is part of the OpenNMS(R) Application.
//
// OpenNMS(R) is Copyright (C) 2002-2003 The OpenNMS Group, Inc.  All rights reserved.
// OpenNMS(R) is a derivative work, containing both original code, included code and modified
// code that was published under the GNU General Public License. Copyrights for modified 
// and included code are below.
//
// OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
//
// Copyright (C) 1999-2001 Oculan Corp.  All rights reserved.
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation; either version 2 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
//
// For more information contact:
//      OpenNMS Licensing       <license@opennms.org>
//      http://www.opennms.org/
//      http://www.opennms.com/
//
// Tab Size = 8
//

package org.opennms.netmgt.actiond.jmx;

public class Actiond implements ActiondMBean {
    public void init() {
        org.opennms.netmgt.actiond.Actiond actiond = org.opennms.netmgt.actiond.Actiond.getInstance();
        actiond.init();
    }

    public void start() {
        org.opennms.netmgt.actiond.Actiond actiond = org.opennms.netmgt.actiond.Actiond.getInstance();
        actiond.start();
    }

    public void stop() {
        org.opennms.netmgt.actiond.Actiond actiond = org.opennms.netmgt.actiond.Actiond.getInstance();
        actiond.stop();
    }

    public int getStatus() {
        org.opennms.netmgt.actiond.Actiond actiond = org.opennms.netmgt.actiond.Actiond.getInstance();
        return actiond.getStatus();
    }

    public String status() {
        return org.opennms.core.fiber.Fiber.STATUS_NAMES[getStatus()];
    }

    public String getStatusText() {
        return org.opennms.core.fiber.Fiber.STATUS_NAMES[getStatus()];
    }
}

@@ -1428,79 +1428,400 @@
 x;%0A%0A
-public class Actiond implements ActiondMBean %7B%0A    public void init() %7B
+import java.lang.reflect.UndeclaredThrowableException;%0A%0Aimport org.opennms.netmgt.config.ActiondConfigFactory;%0A%0Apublic class Actiond implements ActiondMBean %7B%0A    public void init() %7B%0A    %09%0A    %09try %7B%0A%09%09%09ActiondConfigFactory.init();%0A%09%09%7D catch (Exception e) %7B%0A%09%09%09throw new UndeclaredThrowableException(e);%0A%09%09%7D%0A    %09ActiondConfigFactory actiondConfig = ActiondConfigFactory.getInstance();%0A    %09
 %0A   
@@ -1912,32 +1912,81 @@
 .getInstance();%0A
+        actiond.setActiondConfig(actiondConfig);%0A
         actiond.

fix null pointer in actiond init with old manager