From a48ca69d5dc7fd00b43c1678fc1d96c3274ab1f5 Mon Sep 17 00:00:00 2001 From: Björn Geiger Date: Wed, 31 Aug 2011 16:36:30 +0200 Subject: Client und State nun als eigenes Objekt, Shutdown.java noch nicht ganz angepasst --- gearman/controllerWorker/ControllerWorker/ShutdownWorker.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gearman/controllerWorker/ControllerWorker/ShutdownWorker.java') diff --git a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java index 2eea21b..d3d9ae7 100644 --- a/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java +++ b/gearman/controllerWorker/ControllerWorker/ShutdownWorker.java @@ -1,6 +1,5 @@ package ControllerWorker; -import java.util.HashMap; import java.util.Vector; import org.gearman.client.GearmanJobResult; @@ -21,7 +20,7 @@ public class ShutdownWorker extends AbstractGearmanFunction { @Override public GearmanJobResult executeFunction() { String data = ByteUtils.fromUTF8Bytes((byte[]) this.data); - Vector> clients = new Vector>(); + Vector clients = new Vector(); JSONObject jsonObject = (JSONObject) JSONValue.parse(data); String event = jsonObject.get("eventName").toString(); String gearmanServerHost = jsonObject.get("gearmanServerHost") @@ -35,11 +34,8 @@ public class ShutdownWorker extends AbstractGearmanFunction { for (Object clientObj : jsonArray) { JSONObject clientJsonObj = (JSONObject) clientObj; - HashMap clientMap = new HashMap(); - clientMap.put("id", clientJsonObj.get("id").toString()); - clientMap.put("ip", clientJsonObj.get("ip").toString()); - clientMap.put("mac", clientJsonObj.get("mac").toString()); - clients.add(clientMap); + Client client = new Client(clientJsonObj, "The shutdown process of the client has been started."); + clients.add(client); } JSONArray whitelist = (JSONArray) jsonObject.get("whitelist"); -- cgit v1.2.3-55-g7522