From fcc4d9eb5c9c2a343c0b515c10796a8e568a6fae Mon Sep 17 00:00:00 2001 From: emcho Date: Sun, 31 Jan 2010 14:02:23 +0000 Subject: [PATCH] Synchronizes access to request listeenrs --- src/org/ice4j/stack/EventDispatcher.java | 88 ++++++++++++------------ src/org/ice4j/stack/StunStack.java | 3 - 2 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/org/ice4j/stack/EventDispatcher.java b/src/org/ice4j/stack/EventDispatcher.java index 979f366..50c72a9 100644 --- a/src/org/ice4j/stack/EventDispatcher.java +++ b/src/org/ice4j/stack/EventDispatcher.java @@ -25,14 +25,16 @@ public class EventDispatcher /** * All property change listeners registered so far. */ - private Vector requestListeners = null; + private Vector requestListeners + = new Vector(); /** * Hashtable for managing property change listeners registered for specific * properties. Maps property names to PropertyChangeSupport objects. */ private Hashtable - requestListenersChildren = null; + requestListenersChildren + = new Hashtable(); /** * Constructs an EventDispatcher object. @@ -49,13 +51,11 @@ public class EventDispatcher */ public synchronized void addRequestListener(RequestListener listener) { - if (requestListeners == null) + synchronized(requestListeners) { - requestListeners = new Vector(); + if(!requestListeners.contains(listener)) + requestListeners.addElement(listener); } - - if(!requestListeners.contains(listener)) - requestListeners.addElement(listener); } /** @@ -70,18 +70,16 @@ public class EventDispatcher public synchronized void addRequestListener( TransportAddress localAddr, RequestListener listener) { - if (requestListenersChildren == null) + synchronized(requestListenersChildren) { - requestListenersChildren - = new Hashtable(); + EventDispatcher child = requestListenersChildren.get(localAddr); + if (child == null) + { + child = new EventDispatcher(); + requestListenersChildren.put(localAddr, child); + } + child.addRequestListener(listener); } - EventDispatcher child = requestListenersChildren.get(localAddr); - if (child == null) - { - child = new EventDispatcher(); - requestListenersChildren.put(localAddr, child); - } - child.addRequestListener(listener); } /** @@ -95,12 +93,10 @@ public class EventDispatcher public synchronized void removeRequestListener( RequestListener listener) { - - if (requestListeners == null) + synchronized(requestListeners) { - return; + requestListeners.removeElement(listener); } - requestListeners.removeElement(listener); } /** @@ -114,17 +110,16 @@ public class EventDispatcher public synchronized void removeRequestListener(TransportAddress localAddr, RequestListener listener) { - if (requestListenersChildren == null) + synchronized(requestListenersChildren) { - return; - } - EventDispatcher child = requestListenersChildren.get( localAddr ); + EventDispatcher child = requestListenersChildren.get( localAddr ); - if (child == null) - { - return; + if (child == null) + { + return; + } + child.removeRequestListener(listener); } - child.removeRequestListener(listener); } @@ -136,7 +131,7 @@ public class EventDispatcher public void fireMessageEvent(StunMessageEvent evt) { TransportAddress localAddr = evt.getLocalAddress(); - if (requestListeners != null) + synchronized(requestListeners) { List listenersCopy = null; synchronized(requestListeners) @@ -154,7 +149,7 @@ public class EventDispatcher } } - if (requestListenersChildren != null && localAddr != null) + synchronized(requestListenersChildren) { EventDispatcher child = requestListenersChildren.get(localAddr); @@ -166,29 +161,36 @@ public class EventDispatcher } /** - * Check if there are any listeners for a specific NetAccessPointDescriptor. + * Check if there are any listeners for a specific address. * (Generic listeners count as well) * * @param localAddr the NetAccessPointDescriptor. * @return true if there are one or more listeners for the specified * NetAccessPointDescriptor */ - public synchronized boolean hasRequestListeners(TransportAddress localAddr) + public boolean hasRequestListeners(TransportAddress localAddr) { - if(requestListeners != null && !requestListeners.isEmpty()) + synchronized(requestListeners) { - // there is a generic listener - return true; - } - - if (requestListenersChildren != null) - { - EventDispatcher child = requestListenersChildren.get(localAddr); - if (child != null && child.requestListeners != null) + if(!requestListeners.isEmpty()) { - return!child.requestListeners.isEmpty(); + // there is a generic listener + return true; } } + + synchronized(requestListenersChildren) + { + if (requestListenersChildren != null) + { + EventDispatcher child = requestListenersChildren.get(localAddr); + if (child != null && child.requestListeners != null) + { + return !child.requestListeners.isEmpty(); + } + } + } + return false; } diff --git a/src/org/ice4j/stack/StunStack.java b/src/org/ice4j/stack/StunStack.java index 814fddf..0ae47f4 100644 --- a/src/org/ice4j/stack/StunStack.java +++ b/src/org/ice4j/stack/StunStack.java @@ -241,10 +241,7 @@ public class StunStack public void addRequestListener( TransportAddress localAddress, RequestListener listener) { - synchronized(eventDispatcher) - { eventDispatcher.addRequestListener(localAddress, listener); - } } /**