diff --git a/pom.xml b/pom.xml index f88e1c8..01ff86f 100644 --- a/pom.xml +++ b/pom.xml @@ -64,6 +64,11 @@ 4.0.1 provided + + com.googlecode.json-simple + json-simple + 1.1.1 + @@ -75,6 +80,7 @@ sftp://repo.link2tek.net/home/snake/maven_repo + false diff --git a/src/main/java/altk/comm/engine/Broadcast.java b/src/main/java/altk/comm/engine/Broadcast.java index 244831c..28c3fdc 100644 --- a/src/main/java/altk/comm/engine/Broadcast.java +++ b/src/main/java/altk/comm/engine/Broadcast.java @@ -44,7 +44,7 @@ public abstract class Broadcast private BroadcastState state = BroadcastState.ACCEPTED; private Object stateSemaphore = new Object(); - String haltReason; + String reason; String stateErrorText; public CommEngine commEngine; public final long receiveTime; @@ -433,7 +433,7 @@ public abstract class Broadcast } if (pauseThreshold > 0 && lastPauseCount >= pauseThreshold) { - pause(null); + pause(null, null); } } @@ -641,7 +641,6 @@ public abstract class Broadcast */ public StateChangeResult setState(BroadcastState newState) { - if (newState == BroadcastState.ABORTED) return setState(BroadcastState.ABORTED, haltReason, stateErrorText); return setState(newState, null, null); } @@ -652,7 +651,7 @@ public abstract class Broadcast * @return StateChangeResult */ public synchronized StateChangeResult setState(BroadcastState newState, - String haltReason, String stateErrorText) + String reason, String stateErrorText) { boolean isLegal; BroadcastState prev = null; @@ -664,7 +663,7 @@ public abstract class Broadcast prev = state; if (isLegal) { - this.haltReason = haltReason; + this.reason = reason; this.stateErrorText = stateErrorText; CommonLogger.activity.info(String.format("Broadcast %s: State transitioned from %s to %s", broadcastId, state, newState)); @@ -743,9 +742,9 @@ public abstract class Broadcast responseXML.append("'"); if (e == null) { - if (haltReason != null && haltReason.length() > 0) + if (reason != null && reason.length() > 0) { - responseXML.append(" error='" + haltReason + "'"); + responseXML.append(" error='" + reason + "'"); } responseXML.append('>'); } @@ -879,21 +878,10 @@ public abstract class Broadcast + ""); statusBf.append("" + state + "" + changeStateTime + ""); - if (state == BroadcastState.PAUSED - || state == BroadcastState.ABORTED || state == BroadcastState.ABORTING) - { - if (haltReason != null) - { - // Escaping '&' and '<' in haltReason before enclosing it in tag - statusBf.append("" + Util.xmlEscape(haltReason) - + ""); - } - if (stateErrorText != null) - { - statusBf.append("" + Util.xmlEscape(stateErrorText) - + ""); - } - } + statusBf.append("" + (reason == null? "" : Util.xmlEscape(reason)) + + ""); + statusBf.append("" + (stateErrorText == null? "" : Util.xmlEscape(stateErrorText)) + + ""); statusBf.append("" + transactions + ""); statusBf.append("" + successCount.intValue() + ""); statusBf.append(""); + out.write("\n"); + out.write("\n"); + out.write("<" + CLOCK_24HR_PAUSE_KEY + ">" + clock_24hr_pause + "\n"); + out.write("<" + CLOCK_24HR_RESUME_KEY + ">" + clock_24hr_resume + "\n"); + out.write("\n"); out.write(""); } }