Handles unsupported 'data' media type when processing jingle offer.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java
index 5caf298..20822b0 100644
--- a/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java
+++ b/src/net/java/sip/communicator/service/protocol/media/CallPeerMediaHandler.java
@@ -611,6 +611,8 @@ public abstract class CallPeerMediaHandler<T extends MediaAwareCallPeer<?,?,?>>
             return audioDirectionUserPreference;
         case VIDEO:
             return videoDirectionUserPreference;
+        case DATA:
+            return MediaDirection.INACTIVE;
         default:
             throw new IllegalArgumentException("mediaType");
         }
@@ -655,7 +657,10 @@ public abstract class CallPeerMediaHandler<T extends MediaAwareCallPeer<?,?,?>>
      */
     protected List<RTPExtension> getExtensionsForType(MediaType type)
     {
-        return getDefaultDevice(type).getSupportedExtensions();
+        MediaDevice device = getDefaultDevice(type);
+        return device != null
+            ? device.getSupportedExtensions()
+            : new ArrayList<RTPExtension>();
     }
 
     /**