From bb280145c18eee3bf8b6587bec3b0a5213a575e2 Mon Sep 17 00:00:00 2001
From: George Politis <gp@jitsi.org>
Date: Thu, 24 Mar 2016 17:12:22 -0500
Subject: [PATCH] Revert "Calls MediaStream#setTarget() before setConnector()."

---
 .../org/jitsi/videobridge/RtpChannel.java     | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/main/java/org/jitsi/videobridge/RtpChannel.java b/src/main/java/org/jitsi/videobridge/RtpChannel.java
index 72c9832f0a..64a59fc56f 100644
--- a/src/main/java/org/jitsi/videobridge/RtpChannel.java
+++ b/src/main/java/org/jitsi/videobridge/RtpChannel.java
@@ -1072,40 +1072,38 @@ protected void maybeStartStream()
                 return;
         }
 
-        MediaStreamTarget streamTarget = createStreamTarget();
+        // connector
         StreamConnector connector = getStreamConnector();
-        if (streamTarget == null)
-        {
-            logger.info("Not starting stream, target is null");
-            return;
-        }
 
         if (connector == null)
-        {
-            logger.info("Not starting stream, connector is null");
             return;
-        }
+        else
+            stream.setConnector(connector);
 
-        InetSocketAddress dataAddr = streamTarget.getDataAddress();
-        if (dataAddr == null)
+        // target
+        MediaStreamTarget streamTarget = createStreamTarget();
+
+        if (streamTarget != null)
         {
-            logger.info(
-                "Not starting stream, the target's data address is null");
-            return;
-        }
+            InetSocketAddress dataAddr = streamTarget.getDataAddress();
 
-        this.streamTarget.setDataHostAddress(dataAddr.getAddress());
-        this.streamTarget.setDataPort(dataAddr.getPort());
+            if (dataAddr != null)
+            {
+                this.streamTarget.setDataHostAddress(dataAddr.getAddress());
+                this.streamTarget.setDataPort(dataAddr.getPort());
+            }
 
-        InetSocketAddress ctrlAddr = streamTarget.getControlAddress();
-        if (ctrlAddr != null)
-        {
-            this.streamTarget.setControlHostAddress(ctrlAddr.getAddress());
-            this.streamTarget.setControlPort(ctrlAddr.getPort());
-        }
+            InetSocketAddress ctrlAddr = streamTarget.getControlAddress();
 
-        stream.setTarget(streamTarget);
-        stream.setConnector(connector);
+            if (ctrlAddr != null)
+            {
+                this.streamTarget.setControlHostAddress(ctrlAddr.getAddress());
+                this.streamTarget.setControlPort(ctrlAddr.getPort());
+            }
+
+            if (dataAddr != null)
+                stream.setTarget(streamTarget);
+        }
 
         Content content = getContent();
 
@@ -1129,7 +1127,7 @@ protected void maybeStartStream()
             Videobridge videobridge
                 = getContent().getConference().getVideobridge();
             EventAdmin eventAdmin = videobridge.getEventAdmin();
-            if (eventAdmin != null)
+            if (eventAdmin != null && streamTarget != null)
             {
                 eventAdmin
                     .sendEvent(EventFactory.streamStarted(this));