diff options
| author | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2010-10-21 19:26:53 +0000 |
|---|---|---|
| committer | Lyubomir Marinov <lyubomir.marinov@jitsi.org> | 2010-10-21 19:26:53 +0000 |
| commit | 5b97785916d486f6c92fdc1a241e024748c66fb1 (patch) | |
| tree | 5780882d946adc16d1ed5d604b084d7bbe73359c /src/net/java/sip/communicator/service | |
| parent | c1ab17a54f01054142e46aa9f9646bc09a0c39e3 (diff) | |
| download | jitsi-5b97785916d486f6c92fdc1a241e024748c66fb1.zip jitsi-5b97785916d486f6c92fdc1a241e024748c66fb1.tar.gz jitsi-5b97785916d486f6c92fdc1a241e024748c66fb1.tar.bz2 | |
Commits work in progress on enabling ICE support in Jingle calls. Allows video to be started in a call which has been established with audio only.
Diffstat (limited to 'src/net/java/sip/communicator/service')
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/media/TransportManager.java | 12 |
1 files changed, 10 insertions, 2 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 ede43c6..0f8293e 100644 --- a/src/net/java/sip/communicator/service/protocol/media/TransportManager.java +++ b/src/net/java/sip/communicator/service/protocol/media/TransportManager.java @@ -121,8 +121,16 @@ public abstract class TransportManager<U extends MediaAwareCallPeer<?, ?, ?>> { synchronized(connector) { - connector.getDataSocket().close(); - connector.getControlSocket().close(); + DatagramSocket dataSocket = connector.getDataSocket(); + + if (dataSocket != null) + dataSocket.close(); + + DatagramSocket controlSocket = connector.getControlSocket(); + + if (controlSocket != null) + controlSocket.close(); + streamConnectors[mediaType.ordinal()] = null; } } |