You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2012/09/04 20:07:39 UTC
svn commit: r1380777 - in
/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks:
AsyncDeliverTasks.java SyncDeliverTasks.java
Author: cziegeler
Date: Tue Sep 4 18:07:38 2012
New Revision: 1380777
URL: http://svn.apache.org/viewvc?rev=1380777&view=rev
Log:
FELIX-3321 : Improve implementation and reduce load on the service registry
Modified:
felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java
felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java
Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java?rev=1380777&r1=1380776&r2=1380777&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java (original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/AsyncDeliverTasks.java Tue Sep 4 18:07:38 2012
@@ -20,12 +20,10 @@ package org.apache.felix.eventadmin.impl
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import org.apache.felix.eventadmin.impl.handler.EventHandlerProxy;
import org.osgi.service.event.Event;
/**
@@ -69,6 +67,7 @@ public class AsyncDeliverTasks
*/
public void execute(final Collection tasks, final Event event)
{
+ /*
final Iterator i = tasks.iterator();
boolean hasOrdered = false;
while ( i.hasNext() )
@@ -85,7 +84,7 @@ public class AsyncDeliverTasks
}
if ( hasOrdered )
- {
+ {*/
final Thread currentThread = Thread.currentThread();
TaskExecuter executer = null;
synchronized (m_running_threads )
@@ -105,7 +104,7 @@ public class AsyncDeliverTasks
{
m_pool.executeTask(executer);
}
- }
+ //}
}
private final class TaskExecuter implements Runnable
Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java?rev=1380777&r1=1380776&r2=1380777&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java (original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/SyncDeliverTasks.java Tue Sep 4 18:07:38 2012
@@ -110,8 +110,8 @@ public class SyncDeliverTasks
while ( i.hasNext() )
{
final EventHandlerProxy task = (EventHandlerProxy)i.next();
- if ( !filterAsyncUnordered || task.isAsyncOrderedDelivery() )
- {
+// if ( !filterAsyncUnordered || task.isAsyncOrderedDelivery() )
+// {
if ( !useTimeout(task) )
{
// no timeout, we can directly execute
@@ -168,7 +168,7 @@ public class SyncDeliverTasks
}
}
- }
+// }
}
}
}