From e9047f4b31a0f8d91495ee4c60f9cac10f54adcc Mon Sep 17 00:00:00 2001
From: Alexey Shchepin <alexey@process-one.net>
Date: Thu, 7 Dec 2006 02:56:14 +0000
Subject: [PATCH] * src/mod_roster_odbc.erl: Better error handling

* src/web/ejabberd_http_poll.erl: Minor fix

SVN Revision: 690
---
 ChangeLog                      |  6 ++++++
 src/mod_roster_odbc.erl        | 14 +++++++++-----
 src/web/ejabberd_http_poll.erl |  2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ecf910290..10c8a1ad7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-05  Alexey Shchepin  <alexey@sevcom.net>
+
+	* src/mod_roster_odbc.erl: Better error handling
+
+	* src/web/ejabberd_http_poll.erl: Minor fix
+
 2006-12-04  Mickael Remond  <mickael.remond@process-one.net>
 
 	* src/ejabberd_loglevel.erl: Preliminary dynamic loglevel support.
diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
index 9509cc68c..d36dfecda 100644
--- a/src/mod_roster_odbc.erl
+++ b/src/mod_roster_odbc.erl
@@ -702,11 +702,15 @@ get_in_pending_subscriptions(Ls, User, Server) ->
 		    end,
 		    lists:flatmap(
 		      fun(I) ->
-			      R = raw_to_record(LServer, I),
-			      case R#roster.ask of
-				  in   -> [R];
-				  both -> [R];
-				  _ -> []
+			      case raw_to_record(LServer, I) of
+				  error ->
+				      [];
+				  R ->
+				      case R#roster.ask of
+					  in   -> [R];
+					  both -> [R];
+					  _ -> []
+				      end
 			      end
 		      end,
 		      Items));
diff --git a/src/web/ejabberd_http_poll.erl b/src/web/ejabberd_http_poll.erl
index a73fca743..d12277449 100644
--- a/src/web/ejabberd_http_poll.erl
+++ b/src/web/ejabberd_http_poll.erl
@@ -305,7 +305,7 @@ terminate(Reason, StateName, StateData) ->
 	{Receiver, _Tag} ->
 	    Receiver ! {tcp_closed, {http_poll, self()}}
     end,
-    resend_messages(StateData#state.output),
+    catch resend_messages(StateData#state.output),
     ok.
 
 %%%----------------------------------------------------------------------