Merge branch 'ccProductization' into issue1104

* ccProductization: fixed cnf ep issue Update instance-id on registration update This close #1487
RestComm · Oct 16, 2016 · 7b37ef5 · 7b37ef5
2 parents 467d677 + ec16182
commit 7b37ef5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/registrations.xml b/restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/registrations.xml
@@ -37,7 +37,7 @@
   </delete>
 
   <update id="updateRegistration" parameterType="map">
-    UPDATE restcomm_registrations SET ttl=#{ttl}, date_expires=#{date_expires}, date_updated=#{date_updated} WHERE address_of_record=#{address_of_record} AND
+    UPDATE restcomm_registrations SET ttl=#{ttl}, date_expires=#{date_expires}, date_updated=#{date_updated}, instanceid=#{instanceid} WHERE address_of_record=#{address_of_record} AND
     display_name=#{display_name} AND location=#{location} AND user_agent=#{user_agent};
   </update>
 </mapper>
diff --git a/restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/registrations.xml b/restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/registrations.xml
@@ -37,7 +37,7 @@
   </delete>
 
   <update id="updateRegistration" parameterType="map">
-    UPDATE "restcomm_registrations" SET "ttl"=#{ttl}, "date_expires"=#{date_expires}, "date_updated"=#{date_updated} WHERE "address_of_record"=#{address_of_record} AND
+    UPDATE "restcomm_registrations" SET "ttl"=#{ttl}, "date_expires"=#{date_expires}, "date_updated"=#{date_updated}, "instanceid"=#{instanceid} WHERE "address_of_record"=#{address_of_record} AND
     "display_name"=#{display_name} AND "location"=#{location} AND "user_agent"=#{user_agent};
   </update>
 </mapper>
diff --git a/restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java b/restcomm/restcomm.mrb/src/main/java/org/restcomm/connect/mrb/MediaResourceBrokerGeneric.java
@@ -183,7 +183,7 @@ private void onGetMediaGateway(GetMediaGateway message, ActorRef self, ActorRef
             sender.tell(new MediaResourceBrokerResponse<ActorRef>(localMediaGateway), self);
         }else{
             final Sid conferenceSid = addConferenceDetailRecord(conferenceName, callSid);
-            sender.tell(new MediaResourceBrokerResponse<MediaGatewayForConference>(new MediaGatewayForConference(conferenceSid, localMediaGateway)), self);
+            sender.tell(new MediaResourceBrokerResponse<MediaGatewayForConference>(new MediaGatewayForConference(conferenceSid, localMediaGateway, null)), self);
         }
     }
 

diff --git a/...control.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java b/...control.mms/src/main/java/org/restcomm/connect/mscontrol/mms/MmsConferenceController.java
@@ -114,6 +114,7 @@ public final class MmsConferenceController extends MediaServerController {
     private final ActorRef mrb;
     private String conferenceName;
     private Sid conferenceSid;
+    private String conferenceEndpointIdName;
 
     private ConnectionMode connectionMode;
 
@@ -264,6 +265,7 @@ private void onMediaResourceBrokerResponse(MediaResourceBrokerResponse<?> messag
             MediaGatewayForConference mgc = (MediaGatewayForConference) message.get();
             mediaGateway = mgc.mediaGateway();
             this.conferenceSid = mgc.conferenceSid();
+            this.conferenceEndpointIdName = mgc.masterConfernceEndpointIdName();
             fsm.transition(message, acquiringMediaSession);
         }else if(is(acquiringCnfMediaResourceController)){
             conferenceMediaResourceController = (ActorRef) message.get();
@@ -453,8 +455,6 @@ public AcquiringMediaGateway(final ActorRef source) {
         public void execute(final Object message) throws Exception {
             CreateMediaSession createMediaSession = (CreateMediaSession) message;
             String conferenceName = createMediaSession.conferenceName();
-            //TODO: temporary log
-            logger.info( "MMSConferenceController: GetMediaGatewayFromMRB: conferenceName = " + conferenceName  );
             mrb.tell(new GetMediaGateway(createMediaSession.callSid(), conferenceName, null), self());
         }
     }
@@ -492,7 +492,7 @@ public AcquiringEndpoint(final ActorRef source) {
 
         @Override
         public void execute(final Object message) throws Exception {
-            mediaGateway.tell(new CreateConferenceEndpoint(mediaSession), super.source);
+            mediaGateway.tell(new CreateConferenceEndpoint(mediaSession, conferenceEndpointIdName), super.source);
         }
     }