aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/service/protocol/media/TransportManager.java
diff options
context:
space:
mode:
authorSebastien Vincent <seb@jitsi.org>2011-06-09 08:51:21 +0000
committerSebastien Vincent <seb@jitsi.org>2011-06-09 08:51:21 +0000
commit46c8da86d8e2f462a122e0183c34c1b6d1273355 (patch)
tree8a0991e252ee91c3a312a842201926379f011b62 /src/net/java/sip/communicator/service/protocol/media/TransportManager.java
parentd43a1b4ab256f3d5263d960581871a33179f94d1 (diff)
downloadjitsi-46c8da86d8e2f462a122e0183c34c1b6d1273355.zip
jitsi-46c8da86d8e2f462a122e0183c34c1b6d1273355.tar.gz
jitsi-46c8da86d8e2f462a122e0183c34c1b6d1273355.tar.bz2
Ongoing work on Google Talk voice support.
Diffstat (limited to 'src/net/java/sip/communicator/service/protocol/media/TransportManager.java')
-rw-r--r--src/net/java/sip/communicator/service/protocol/media/TransportManager.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/media/TransportManager.java b/src/net/java/sip/communicator/service/protocol/media/TransportManager.java
index 0f8293e..24be5f6 100644
--- a/src/net/java/sip/communicator/service/protocol/media/TransportManager.java
+++ b/src/net/java/sip/communicator/service/protocol/media/TransportManager.java
@@ -96,7 +96,8 @@ public abstract class TransportManager<U extends MediaAwareCallPeer<?, ?, ?>>
if ((streamConnector == null)
|| streamConnector.getDataSocket().isClosed()
- || streamConnector.getControlSocket().isClosed())
+ || (streamConnector.getControlSocket() != null &&
+ streamConnector.getControlSocket().isClosed()))
{
streamConnectors[mediaType.ordinal()]
= streamConnector