From f2658faaaadfc02dbca05adec88999574fb6ecb9 Mon Sep 17 00:00:00 2001 From: Suraputt Suntimitr Date: Fri, 22 Apr 2016 11:17:28 +0700 Subject: [PATCH] Eqx Timeout Flow3 --- AF-Demo/src/af/state/StateIdle.java | 7 +++---- AF-Demo/src/af/state/StateWaitA.java | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/AF-Demo/src/af/state/StateIdle.java b/AF-Demo/src/af/state/StateIdle.java index 374c5c8..daf03d5 100644 --- a/AF-Demo/src/af/state/StateIdle.java +++ b/AF-Demo/src/af/state/StateIdle.java @@ -22,11 +22,9 @@ public class StateIdle implements IAFState { @Override public String doAction(AbstractAF abstractAF, Object instance, ArrayList eqxRawDataList) { EC02Instance ec02Ins = (EC02Instance) instance; - if(ec02Ins.getAFInstance().getInvoke()!=null){ + AppLog.d("%%%%%%%"+ec02Ins.getAFInstance().getInvoke()); + if(ec02Ins.getAFInstance().getInvoke()!=""){ for(EquinoxRawData eqxRawData : eqxRawDataList){ - this.ec02Builder.setEquinoxRawData(eqxRawData, abstractAF, ec02Ins); - ec02Ins.getAFInstance().setInvoke(eqxRawData.getInvoke()); - ec02Ins.getAFInstance().setOrig(eqxRawData.getRawDataAttribute(EQXMsg.ORIG)); EQXRawInstance eqxRaw = new EQXRawInstance(); eqxRaw.setMessage("Already in use!"); eqxRaw.setTo(ec02Ins.getAFInstance().getOrig()); @@ -38,6 +36,7 @@ public class StateIdle implements IAFState { else{ for(EquinoxRawData eqxRawData : eqxRawDataList){ this.ec02Builder.setEquinoxRawData(eqxRawData, abstractAF, ec02Ins); + AppLog.d("%%%%%%%"+ec02Ins.getAFInstance().getInvoke()); ec02Ins.getAFInstance().setInvoke(eqxRawData.getInvoke()); ec02Ins.getAFInstance().setOrig(eqxRawData.getRawDataAttribute(EQXMsg.ORIG)); diff --git a/AF-Demo/src/af/state/StateWaitA.java b/AF-Demo/src/af/state/StateWaitA.java index 4e5eb1c..19662d1 100644 --- a/AF-Demo/src/af/state/StateWaitA.java +++ b/AF-Demo/src/af/state/StateWaitA.java @@ -22,12 +22,21 @@ public class StateWaitA implements IAFState { @Override public String doAction(AbstractAF abstractAF, Object instance, ArrayList eqxRawDataList) { EC02Instance ec02Ins = (EC02Instance) instance; + for (EquinoxRawData eqxRawData : eqxRawDataList) { + if(eqxRawData.getType().equals("request")){ + EQXRawInstance eqxRaw = new EQXRawInstance(); + eqxRaw.setMessage("Already in use!"); + eqxRaw.setTo(ec02Ins.getAFInstance().getOrig()); + eqxRaw.setCtype(EQXMsg.TEXTPLAIN); + this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw,eqxRawData.getInvoke())); + eqxState = ec02Ins.getAFInstance().getState(); + } + else{ if(ec02Ins.getEquinoxProperties().getDiag().equals("Timeout")){ this.eqxRawDataList=ec02Ins.getAFInstance().getTimeout(); eqxState = ec02Ins.getAFInstance().getState(); } else{ - for (EquinoxRawData eqxRawData : eqxRawDataList) { this.ec02Builder.setEquinoxRawData(eqxRawData, abstractAF, ec02Ins); /* @@ -56,9 +65,10 @@ public class StateWaitA implements IAFState { this.eqxRawDataList.add(this.ec02Builder.getHTTPResponse(eqxRaw,ec02Ins.getAFInstance().getInvoke())); this.eqxState = AFState.IDLE; ec02Ins.getAFInstance().setInvoke(null); + + } } } - ec02Ins.setEqxRawDataList(this.eqxRawDataList); ec02Ins.getAFInstance().setTimeout(this.eqxRawDataList); ec02Ins.getAFInstance().setState(eqxState); -- libgit2 0.21.2