Catch exceptions when delivering messages. Problem with missed message on snow leopard, chat alerter throwing exception.

16 years ago · 173869a707
parent de4f2d14bb
commit 173869a707
1 changed files with 20 additions and 11 deletions
--- a/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
+++ b/src/net/java/sip/communicator/service/protocol/AbstractOperationSetBasicInstantMessaging.java
@ -177,17 +177,26 @@ else if (evt instanceof MessageDeliveryFailedEvent)
            .hasNext();)
        {
            MessageListener listener = listenerIter.next();
-            switch (eventType){
-            case MessageDelivered:
-                listener.messageDelivered((MessageDeliveredEvent) evt);
-                break;
-            case MessageDeliveryFailed:
-                listener
-                .messageDeliveryFailed((MessageDeliveryFailedEvent) evt);
-                break;
-            case MessageReceived:
-                listener.messageReceived((MessageReceivedEvent) evt);
-                break;
+
+            try
+            {
+                switch (eventType)
+                {
+                    case MessageDelivered:
+                        listener.messageDelivered((MessageDeliveredEvent) evt);
+                        break;
+                    case MessageDeliveryFailed:
+                        listener
+                        .messageDeliveryFailed((MessageDeliveryFailedEvent)evt);
+                        break;
+                    case MessageReceived:
+                        listener.messageReceived((MessageReceivedEvent) evt);
+                        break;
+                }
+            }
+            catch (Throwable e)
+            {
+                logger.error("Error delivering message", e);
            }
        }
    }