From 039fac7ab7a00f507d11ba0cc8296ef555fd7d14 Mon Sep 17 00:00:00 2001
From: Florian Schmaus <flo@geekplace.eu>
Date: Mon, 29 Sep 2014 13:52:13 +0200
Subject: [PATCH] Fix PingManager.ping(String,long)

ignoring timeout. SMACK-609
---
 .../main/java/org/jivesoftware/smackx/ping/PingManager.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
index 7f5d1a658..7dc506191 100644
--- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
+++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java
@@ -164,7 +164,7 @@ public class PingManager extends Manager {
      * by the entity.
      * 
      * @param jid The id of the entity the ping is being sent to
-     * @param pingTimeout The time to wait for a reply
+     * @param pingTimeout The time to wait for a reply in milliseconds
      * @return true if a reply was received from the entity, false otherwise.
      * @throws NoResponseException if there was no response from the jid.
      * @throws NotConnectedException 
@@ -172,7 +172,7 @@ public class PingManager extends Manager {
     public boolean ping(String jid, long pingTimeout) throws NotConnectedException, NoResponseException {
         Ping ping = new Ping(jid);
         try {
-            connection().createPacketCollectorAndSend(ping).nextResultOrThrow();
+            connection().createPacketCollectorAndSend(ping).nextResultOrThrow(pingTimeout);
         }
         catch (XMPPException exc) {
             return jid.equals(connection().getServiceName());