Revision: 5df8f9cd3dd0
Author:   Alexandre Mendonça <ammendonca>
Date:     Mon Dec 16 00:37:42 2013 UTC
Log: ISSUE 50: Fix handleFailureMessage method to take more generic args (AppAnswer/RequestEvent) so that it can handle STA messages as well.
Update Issue 50
Status: Fixed
Fixed as suggested above.

http://code.google.com/p/jdiameter/source/detail?r=5df8f9cd3dd0

Modified:
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/app/rx/ClientRxSessionImpl.java

=======================================
--- /core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/app/rx/ClientRxSessionImpl.java Fri Nov 23 03:00:29 2012 UTC +++ /core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/app/rx/ClientRxSessionImpl.java Mon Dec 16 00:37:42 2013 UTC
@@ -43,6 +43,7 @@
 import org.jdiameter.api.RouteException;
 import org.jdiameter.api.app.AppAnswerEvent;
 import org.jdiameter.api.app.AppEvent;
+import org.jdiameter.api.app.AppRequestEvent;
 import org.jdiameter.api.app.AppSession;
 import org.jdiameter.api.app.StateChangeListener;
 import org.jdiameter.api.app.StateEvent;
@@ -245,7 +246,7 @@
                   setState(ClientRxSessionState.IDLE, false);
                 }
                 if (isProvisional(resultCode) || isFailure(resultCode)) {
- handleFailureMessage((RxAAAnswer) answer, (RxAARequest) localEvent.getRequest(), eventType); + handleFailureMessage(answer, (AppRequestEvent) localEvent.getRequest(), eventType);
                 }

deliverRxAAAnswer((RxAARequest) localEvent.getRequest(), (RxAAAnswer) localEvent.getAnswer());
@@ -335,7 +336,7 @@
                 setState(ClientRxSessionState.OPEN);
               }
else if (isProvisional(resultCode) || isFailure(resultCode)) { - handleFailureMessage((RxAAAnswer) answer, (RxAARequest) localEvent.getRequest(), eventType); + handleFailureMessage(answer, (AppRequestEvent) localEvent.getRequest(), eventType);
               }
deliverRxAAAnswer((RxAARequest) localEvent.getRequest(), (RxAAAnswer) localEvent.getAnswer());
               break;
@@ -385,10 +386,10 @@
           break;

         case PENDING_STR:
- AppAnswerEvent STanswer = (AppAnswerEvent) localEvent.getAnswer(); + AppAnswerEvent stanswer = (AppAnswerEvent) localEvent.getAnswer();
           switch (eventType) {
             case RECEIVE_STA:
- long resultCode = STanswer.getResultCodeAvp().getUnsigned32(); + long resultCode = stanswer.getResultCodeAvp().getUnsigned32();
               if (isSuccess(resultCode)) {
                 // Current State: PENDING_STR
                 // Event: Successful ST answer received
@@ -396,7 +397,7 @@
                 setState(ClientRxSessionState.IDLE, false);
               }
else if (isProvisional(resultCode) || isFailure(resultCode)) { - handleFailureMessage((RxAAAnswer) STanswer, (RxAARequest) localEvent.getRequest(), eventType); + handleFailureMessage(stanswer, (AppRequestEvent) localEvent.getRequest(), eventType);
               }
deliverRxSessionTermAnswer((RxSessionTermRequest) localEvent.getRequest(), (RxSessionTermAnswer) localEvent.getAnswer());
               break;
@@ -594,7 +595,7 @@
     //}
   }

- protected void handleFailureMessage(final RxAAAnswer event, final RxAARequest request, final Event.Type eventType) { + protected void handleFailureMessage(final AppAnswerEvent event, final AppRequestEvent request, final Event.Type eventType) {
     try {
       setState(ClientRxSessionState.IDLE);
     }

--

--- You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.

Reply via email to