You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/08/18 16:12:30 UTC

svn commit: r432594 - /incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java

Author: rickhall
Date: Fri Aug 18 07:12:29 2006
New Revision: 432594

URL: http://svn.apache.org/viewvc?rev=432594&view=rev
Log:
The rewritten EventDispatcher (FELIX-5) was using equals() instead of == to
compare listeners because the old dispatching mechanism also did so. The
difference, however, was that the old mechanism wrapped listeners and
implemented equals() to do an == comparison on the original listener. Since
the new EventDispatcher does not need to wrap listeners, it should just
use == instead of equals(). This modification implements that change.

Modified:
    incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java

Modified: incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java?rev=432594&r1=432593&r2=432594&view=diff
==============================================================================
--- incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java (original)
+++ incubator/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/EventDispatcher.java Fri Aug 18 07:12:29 2006
@@ -259,7 +259,7 @@
             {
                 if (listeners[i + LISTENER_BUNDLE_OFFSET].equals(bundle) &&
                     (listeners[i + LISTENER_CLASS_OFFSET] == clazz) &&
-                    listeners[i + LISTENER_OBJECT_OFFSET].equals(l))
+                    (listeners[i + LISTENER_OBJECT_OFFSET] == l))
                 {
                     idx = i;
                     break;
@@ -427,7 +427,7 @@
             {
                 if (listeners[i + LISTENER_BUNDLE_OFFSET].equals(bundle) &&
                     (listeners[i + LISTENER_CLASS_OFFSET] == clazz) &&
-                    listeners[i + LISTENER_OBJECT_OFFSET].equals(l))
+                    (listeners[i + LISTENER_OBJECT_OFFSET] == l))
                 {
                     if (l instanceof FrameworkListener)
                     {