diff options
| author | paweldomas <pawel.domas@jitsi.org> | 2014-07-01 09:43:44 +0200 |
|---|---|---|
| committer | paweldomas <pawel.domas@jitsi.org> | 2014-07-01 09:43:44 +0200 |
| commit | 3492885832deafa07cac60bdbc94d7c324cec59c (patch) | |
| tree | 8ef2136e78e5fcce66c0201376f1ab419c680e27 /src | |
| parent | 0dff89bf2dd1347d7ef71640cb79c5287be0d0a9 (diff) | |
| download | jitsi-3492885832deafa07cac60bdbc94d7c324cec59c.zip jitsi-3492885832deafa07cac60bdbc94d7c324cec59c.tar.gz jitsi-3492885832deafa07cac60bdbc94d7c324cec59c.tar.bz2 | |
Attempts to handle error when unsupported SRTP control type exists in account properties.
Diffstat (limited to 'src')
| -rw-r--r-- | src/net/java/sip/communicator/service/protocol/AccountID.java | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/net/java/sip/communicator/service/protocol/AccountID.java b/src/net/java/sip/communicator/service/protocol/AccountID.java index 412ce3f..c078c13 100644 --- a/src/net/java/sip/communicator/service/protocol/AccountID.java +++ b/src/net/java/sip/communicator/service/protocol/AccountID.java @@ -1005,8 +1005,17 @@ public abstract class AccountID ProtocolProviderFactory.ENCRYPTION_PROTOCOL .length() + 1); - sortedEncryptionProtocols.add(index, - SrtpControlType.fromString(name)); + try + { + sortedEncryptionProtocols.add(index, + SrtpControlType.fromString(name)); + } + catch(IllegalArgumentException exc) + { + logger.error( + "Failed to get SRTP control type for name: '" + + name + "', key: '" + e.getKey() + "'", exc); + } } } |