Merge "Bug #1752 swap egress/ingress ACLs"

[netvirt.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / impl / EventDispatcherImpl.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/EventDispatcherImpl.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/EventDispatcherImpl.java
index b14daeae39b659e0e7f421e6192c22ec4f240e7b..8ef0d2c0155ecb021e4fd1c6377ea5a6e2b8b3b6 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/EventDispatcherImpl.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/EventDispatcherImpl.java
@@ -29,7 +29,7 @@ public class EventDispatcherImpl implements EventDispatcher {
 
     static final Logger logger = LoggerFactory.getLogger(EventDispatcher.class);
     private ExecutorService eventHandler;
-    private BlockingQueue<AbstractEvent> events;
+    private volatile BlockingQueue<AbstractEvent> events;
 
     private AbstractHandler[] handlers;
 
@@ -51,7 +51,11 @@ public class EventDispatcherImpl implements EventDispatcher {
                         logger.info("The event handler thread was interrupted, shutting down", e);
                         return;
                     }
-                    dispatchEvent(ev);
+                    try {
+                        dispatchEvent(ev);
+                    } catch (Exception e) {
+                        logger.error("Exception in dispatching event "+ev.toString(), e);
+                    }
                 }
             }
         });