summaryrefslogtreecommitdiffstats
path: root/gearman/controllerWorker/ControllerWorker/StatusWorker.java
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-22 15:12:18 +0200
committerBjörn Geiger2011-09-22 15:12:18 +0200
commitddafa532534f63a768ee6793392d39f22ca100a3 (patch)
treef9ffa7d8d62b151723aaa8d723ca51451eca5563 /gearman/controllerWorker/ControllerWorker/StatusWorker.java
parentStatusWorker überarbeitet, noch nicht getestet (diff)
downloadpoolctrl-ddafa532534f63a768ee6793392d39f22ca100a3.tar.gz
poolctrl-ddafa532534f63a768ee6793392d39f22ca100a3.tar.xz
poolctrl-ddafa532534f63a768ee6793392d39f22ca100a3.zip
verschiedene Korrekturen
Diffstat (limited to 'gearman/controllerWorker/ControllerWorker/StatusWorker.java')
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/StatusWorker.java42
1 files changed, 23 insertions, 19 deletions
diff --git a/gearman/controllerWorker/ControllerWorker/StatusWorker.java b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
index 75bca69..4700dbe 100755
--- a/gearman/controllerWorker/ControllerWorker/StatusWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
@@ -17,8 +17,8 @@ import org.json.simple.JSONValue;
public class StatusWorker extends AbstractGearmanFunction {
// private static final Logger logger = ControllerWorkerMain.getLogger();
- private HashMap<String, BootState> BOOTSTATES = new HashMap<String, BootState>();
- private HashMap<String, ShutdownState> SHUTDOWNSTATES = new HashMap<String, ShutdownState>();
+ private static final HashMap<String, BootState> BOOTSTATES = new HashMap<String, BootState>();
+ private static final HashMap<String, ShutdownState> SHUTDOWNSTATES = new HashMap<String, ShutdownState>();
@Override
public String getName() {
@@ -29,23 +29,27 @@ public class StatusWorker extends AbstractGearmanFunction {
public GearmanJobResult executeFunction() {
String data = ByteUtils.fromUTF8Bytes((byte[]) this.data);
JSONObject jsonObject = (JSONObject) JSONValue.parse(data);
- String type = jsonObject.get("type").toString();
- if (type == "getBootState") {
- return getBootState(jsonObject);
- } else if (type == "getShutdownState") {
- return getShutdownState(jsonObject);
- } else if (type == "updateClientStateBoot") {
- return updateClientStateBoot(jsonObject);
- } else if (type == "updateClientStateShutdown") {
- return updateClientStateShutdown(jsonObject);
- } else if (type == "createBootState") {
- return createBootState(jsonObject);
- } else if (type == "createShutdownState") {
- return createShutdownState(jsonObject);
- } else if (type == "finishBootState") {
- return finishBootState(jsonObject);
- } else if (type == "finishShutdownState") {
- return finishShutdownState(jsonObject);
+ if (jsonObject != null) {
+ String type = jsonObject.get("type").toString();
+ if (type.equals("getBootState")) {
+ return getBootState(jsonObject);
+ } else if (type.equals("getShutdownState")) {
+ return getShutdownState(jsonObject);
+ } else if (type.equals("updateClientStateBoot")) {
+ return updateClientStateBoot(jsonObject);
+ } else if (type.equals("updateClientStateShutdown")) {
+ return updateClientStateShutdown(jsonObject);
+ } else if (type.equals("createBootState")) {
+ return createBootState(jsonObject);
+ } else if (type.equals("createShutdownState")) {
+ return createShutdownState(jsonObject);
+ } else if (type.equals("finishBootState")) {
+ return finishBootState(jsonObject);
+ } else if (type.equals("finishShutdownState")) {
+ return finishShutdownState(jsonObject);
+ } else {
+ return null;
+ }
} else {
return null;
}