From b86eb130ef8a1b06a34454a47738e0a8ba9b50dd Mon Sep 17 00:00:00 2001
From: Ugnich Anton
Date: Sat, 7 Sep 2013 19:54:51 +0700
Subject: XMPPConnection.buildTextFrame; SocketSubscribed.sendByteBuffer, close

---
 src/com/juick/jabber/ws/WSKeepAlive.java | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

(limited to 'src/com/juick/jabber/ws/WSKeepAlive.java')

diff --git a/src/com/juick/jabber/ws/WSKeepAlive.java b/src/com/juick/jabber/ws/WSKeepAlive.java
index 2e36b100..2deef594 100644
--- a/src/com/juick/jabber/ws/WSKeepAlive.java
+++ b/src/com/juick/jabber/ws/WSKeepAlive.java
@@ -73,35 +73,11 @@ public class WSKeepAlive implements Runnable {
                     }
 
                     if (inactive > 180) {
-                        closeBytes.rewind();
-                        try {
-                            s.sock.write(closeBytes);
-                        } catch (Exception e) {
-                        } finally {
-                            try {
-                                s.sock.socket().close();
-                            } catch (Exception ex) {
-                            }
-                            try {
-                                s.sock.close();
-                            } catch (Exception ex) {
-                            }
-                            i.remove();
-                        }
+                        s.sendByteBuffer(closeBytes);
+                        s.close();
+                        i.remove();
                     } else if (inactive > 60) {
-                        pingBytes.rewind();
-                        try {
-                            s.sock.write(pingBytes);
-                        } catch (Exception e) {
-                            System.err.println("WSKeepAlive ping: " + e);
-                            try {
-                                s.sock.socket().close();
-                            } catch (Exception ex) {
-                            }
-                            try {
-                                s.sock.close();
-                            } catch (Exception ex) {
-                            }
+                        if (!s.sendByteBuffer(pingBytes)) {
                             i.remove();
                         }
                     }
-- 
cgit v1.2.3