master moved from 68866e4adec4 to 159d85b81ded

2 new revisions:

Revision: 2d73ff9f4b65
Author:   Alexandre Mendonça <ammendonca>
Date:     Thu Dec 12 23:42:58 2013 UTC
Log: ISSUE 47: Add setError when Result-Code >= 3000 && < 4000, right befor...
http://code.google.com/p/jdiameter/source/detail?r=2d73ff9f4b65

Revision: 159d85b81ded
Author:   Alexandre Mendonça <ammendonca>
Date:     Thu Dec 12 23:58:08 2013 UTC
Log:      Merge branch 'master' of https://code.google.com/p/jdiameter
http://code.google.com/p/jdiameter/source/detail?r=159d85b81ded

==============================================================================
Revision: 2d73ff9f4b65
Author:   Alexandre Mendonça <ammendonca>
Date:     Thu Dec 12 23:42:58 2013 UTC
Log: ISSUE 47: Add setError when Result-Code >= 3000 && < 4000, right before sending answer.
Update Issue 47
Status: Fixed
Applied above fix and commented an setError usage which may be misleading (wouldn't cause issues as the fix overwrites any misusage).

http://code.google.com/p/jdiameter/source/detail?r=2d73ff9f4b65

Modified:
/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerImpl.java

=======================================
--- /core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerImpl.java Fri Dec 7 15:54:20 2012 UTC +++ /core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/controller/PeerImpl.java Thu Dec 12 23:42:58 2013 UTC
@@ -618,7 +618,8 @@
protected void sendErrorAnswer(IRequest request, String errorMessage, int resultCode, Avp ...avpsToAdd) { logger.debug("Could not process request. Result Code = [{}], Error Message: [{}]", resultCode, errorMessage);
     request.setRequest(false);
-    request.setError(true);
+ // Not setting error flag, depends on error code. Will be set @ PeerImpl.ActionContext.sendMessage(IMessage)
+    // request.setError(true);
     request.getAvps().addAvp(RESULT_CODE, resultCode, true, false, true);

     //add before removal actions
@@ -709,6 +710,14 @@
       }
       // Remove destination information from answer messages
       if (!message.isRequest()) {
+        try {
+          long resultCode = message.getResultCode().getUnsigned32();
+          message.setError(resultCode >= 3000 && resultCode < 4000);
+        }
+        catch (Exception e) {
+ logger.debug("Unable to retrieve Result-Code from answer. Not setting ERROR bit.");
+          // ignore. should not happen
+        }
// 6.2. Diameter Answer Processing answers and Error messages DONT have those.... pffff.
         message.getAvps().removeAvp(DESTINATION_HOST);
         message.getAvps().removeAvp(DESTINATION_REALM);

==============================================================================
Revision: 159d85b81ded
Author:   Alexandre Mendonça <ammendonca>
Date:     Thu Dec 12 23:58:08 2013 UTC
Log:      Merge branch 'master' of https://code.google.com/p/jdiameter

http://code.google.com/p/jdiameter/source/detail?r=159d85b81ded


--

--- 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