aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorLyubomir Marinov <lyubomir.marinov@jitsi.org>2011-10-24 10:31:06 +0000
committerLyubomir Marinov <lyubomir.marinov@jitsi.org>2011-10-24 10:31:06 +0000
commit2ce621309bcd2e0c1e55357be173fe47ac9e2fe9 (patch)
tree0908de4fa8cf84342f5447a91fa231c5c91ff802 /test
parentfbd33b96f8ffdd580e399502903e9f1cdc670292 (diff)
downloadjitsi-2ce621309bcd2e0c1e55357be173fe47ac9e2fe9.zip
jitsi-2ce621309bcd2e0c1e55357be173fe47ac9e2fe9.tar.gz
jitsi-2ce621309bcd2e0c1e55357be173fe47ac9e2fe9.tar.bz2
Loads the Java VM into Jitsi's run.exe in order to fix issue #963: Starting Jitsi via pinned taskbar icon makes a second Jitsi icon appear in the taskbar instead of highlighting the existing one. Based on ibauersachs' patch.
Diffstat (limited to 'test')
-rw-r--r--test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java b/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java
index 62c7cf5..089d0f9 100644
--- a/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java
+++ b/test/net/java/sip/communicator/slick/runner/SipCommunicatorSlickRunner.java
@@ -225,8 +225,10 @@ public class SipCommunicatorSlickRunner
try
{
- ServiceReference[] srl =
- bc.getServiceReferences(null, "(service.pid=" + id + ")");
+ ServiceReference[] srl
+ = bc.getServiceReferences(
+ (String) null,
+ "(service.pid=" + id + ")");
if (srl == null || srl.length == 0)
{