Merge pull request #177 from malanka/master

Problem: Name "disconnecting" is ambigous, because "disconnected" sta…
zeromq · May 4, 2016 · 7b15ffb · 7b15ffb
2 parents 714cbff + 7a38ba5
commit 7b15ffb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/mlm_client.xml b/src/mlm_client.xml
@@ -68,7 +68,7 @@
             <action name = "prepare service offer command" />
             <action name = "send" message = "SERVICE OFFER" />
         </event>
-        <event name = "destructor" next = "disconnecting">
+        <event name = "destructor" next = "terminating">
             <action name = "send" message = "CONNECTION CLOSE" />
         </event>
         <event name = "STREAM DELIVER">
@@ -97,7 +97,7 @@
     </state>
 
     <!-- After client calls destructor -->
-    <state name = "disconnecting" inherit = "defaults">
+    <state name = "terminating" inherit = "defaults">
         <event name = "OK">
             <action name = "signal success" />
             <action name = "terminate" />

diff --git a/src/mlm_client_engine.inc b/src/mlm_client_engine.inc
@@ -28,7 +28,7 @@ typedef enum {
     connecting_state = 2,
     connected_state = 3,
     confirming_state = 4,
-    disconnecting_state = 5,
+    terminating_state = 5,
     reconnecting_state = 6,
     disconnected_state = 7,
     defaults_state = 8,
@@ -66,7 +66,7 @@ s_state_name [] = {
     "connecting",
     "connected",
     "confirming",
-    "disconnecting",
+    "terminating",
     "reconnecting",
     "disconnected",
     "defaults",
@@ -691,7 +691,7 @@ s_client_execute (s_client_t *self, event_t event)
                         mlm_proto_send (self->message, self->dealer);
                     }
                     if (!self->exception)
-                        self->state = disconnecting_state;
+                        self->state = terminating_state;
                 }
                 else
                 if (self->event == stream_deliver_event) {
@@ -841,7 +841,7 @@ s_client_execute (s_client_t *self, event_t event)
                 }
                 break;
 
-            case disconnecting_state:
+            case terminating_state:
                 if (self->event == ok_event) {
                     if (!self->exception) {
                         //  signal success