From a4afabe5d5027809f5695bb0b30ffecdf96c9c20 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Wed, 3 Jul 2013 14:01:20 +0300 Subject: [PATCH] Removes some generics method declarations that are hitting some jdk bugs on build system (http://bugs.sun.com/view_bug.do?bug_id=6932571). --- .../jabber/OperationSetTelephonyConferencingJabberImpl.java | 2 +- .../media/AbstractOperationSetTelephonyConferencing.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java index 9be9aeef4..12e7ab9bf 100644 --- a/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java +++ b/src/net/java/sip/communicator/impl/protocol/jabber/OperationSetTelephonyConferencingJabberImpl.java @@ -428,7 +428,7 @@ private void handleCoin(CallPeerJabberImpl callPeer, CoinIQ coinIQ) * SID. */ protected ConferenceInfoDocument getCurrentConferenceInfo( - MediaAwareCallPeer callPeer) + MediaAwareCallPeer callPeer) { ConferenceInfoDocument confInfo = super.getCurrentConferenceInfo(callPeer); diff --git a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java index e9a10ad78..eb1a2e374 100644 --- a/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java +++ b/src/net/java/sip/communicator/service/protocol/media/AbstractOperationSetTelephonyConferencing.java @@ -1021,7 +1021,7 @@ public static String stripParametersFromAddress(String address) * state of the conference in which this CallPeer participates. */ protected ConferenceInfoDocument getCurrentConferenceInfo( - MediaAwareCallPeer callPeer) + MediaAwareCallPeer callPeer) { ConferenceInfoDocument confInfo; try