From ae6c95eec83ee7efaa9d72822d083581e8c0c28b Mon Sep 17 00:00:00 2001
From: Anton Georgiev <anto.georgiev@gmail.com>
Date: Wed, 13 Jan 2016 22:01:30 +0000
Subject: [PATCH] improve syntax

---
 .../org/freeswitch/esl/client/inbound/Client.java    | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java b/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
index 062915abc1..cb733e194a 100755
--- a/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
+++ b/bbb-fsesl-client/src/main/java/org/freeswitch/esl/client/inbound/Client.java
@@ -479,22 +479,14 @@ public class Client
                                         //Member transfered to another conf...
                                         listener.conferenceEventTransfer(uniqueId, confName, confSize, event);
                                         return;
-                                    } else if (eventFunc.equals("conference_add_member")) {
+                                    } else if (eventFunc.equals("conference_add_member") || eventFunc.equals("conference_member_add")) {
                                     	System.out.println("##### Client conference_add_member");
                                         listener.conferenceEventJoin(uniqueId, confName, confSize, event);
                                         return;
-                                    } else if (eventFunc.equals("conference_member_add")) { // added to address FS renaming in 14aa7205128b1938f43b3ae0524123723c013314
-                                        System.out.println("##### Client conference_member_add");
-                                        listener.conferenceEventJoin(uniqueId, confName, confSize, event);
-                                        return;
-                                    } else if (eventFunc.equals("conference_del_member")) {
+                                    } else if (eventFunc.equals("conference_del_member") || eventFunc.equals("conference_member_del")) {
                                     	System.out.println("##### Client conference_del_member");
                                         listener.conferenceEventLeave(uniqueId, confName, confSize, event);
                                         return;
-                                    } else if (eventFunc.equals("conference_member_del")) { // added to address FS renaming in 14aa7205128b1938f43b3ae0524123723c013314
-                                    	System.out.println("##### Client conference_member_del");
-                                        listener.conferenceEventLeave(uniqueId, confName, confSize, event);
-                                        return;
                                     } else if (eventFunc.equals("conf_api_sub_mute")) {
                                         listener.conferenceEventMute(uniqueId, confName, confSize, event);
                                         return;
-- 
GitLab