svn commit: r1789669 - /felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java

[cz...@apache.org]

Author: cziegeler
Date: Fri Mar 31 12:15:18 2017
New Revision: 1789669

URL: http://svn.apache.org/viewvc?rev=1789669&view=rev
Log:
FELIX-5567 : EventAdmin contains compact3 profile code

Modified:
    felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java

Modified: felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java
URL: http://svn.apache.org/viewvc/felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java?rev=1789669&r1=1789668&r2=1789669&view=diff
==============================================================================
--- felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java (original)
+++ felix/trunk/eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/tasks/HandlerTask.java Fri Mar 31 12:15:18 2017
@@ -18,9 +18,6 @@
  */
 package org.apache.felix.eventadmin.impl.tasks;
 
-import java.lang.management.ManagementFactory;
-import java.lang.management.ThreadMXBean;
-
 import org.apache.felix.eventadmin.impl.handler.EventHandlerProxy;
 import org.osgi.service.event.Event;
 
@@ -38,8 +35,6 @@ public class HandlerTask implements Runn
 
 	private final BlacklistLatch handlerLatch;
 
-	private volatile long threadId;
-
 	private volatile long startTime;
 
 	private volatile long endTime;
@@ -58,25 +53,11 @@ public class HandlerTask implements Runn
 		this.event = event;
 		this.timeout = timeout;
 		this.handlerLatch = handlerLatch;
-		this.threadId = -1l;
 		this.startTime = -1l;
 		this.endTime = -1l;
 	}
 
 	/**
-	 *
-	 * Perform timing based on thread CPU time with clock time fall back.
-	 *
-	 * @return
-	 */
-	public long getTimeInMillis()
-    {
-        ThreadMXBean bean = ManagementFactory.getThreadMXBean();
-        return bean.isThreadCpuTimeEnabled() ?
-            bean.getThreadCpuTime(threadId)/1000000 : System.currentTimeMillis();
-    }
-
-	/**
 	 * Run Hander Event
 	 */
     @Override
@@ -84,11 +65,10 @@ public class HandlerTask implements Runn
     {
         try
         {
-        	threadId = Thread.currentThread().getId();
-            startTime = getTimeInMillis();
+            startTime = System.currentTimeMillis();
             // execute the task
             task.sendEvent(event);
-            endTime = getTimeInMillis();
+            endTime = System.currentTimeMillis();
             checkForBlacklist();
         }
         finally
@@ -123,7 +103,7 @@ public class HandlerTask implements Runn
      */
     public void checkForBlacklist()
     {
-    	if(useTimeout() && getTaskTime() > this.timeout)
+    	if (useTimeout() && getTaskTime() > this.timeout)
 		{
 			task.blackListHandler();
 		}
@@ -135,15 +115,15 @@ public class HandlerTask implements Runn
      *
      * @return
      */
-    public long getTaskTime()
+    private long getTaskTime()
     {
-    	if(threadId < 0l || startTime < 0l)
+    	if (startTime < 0l)
     	{
     		return 0l;
     	}
     	else if(endTime < 0l)
     	{
-    		return getTimeInMillis() - startTime;
+    		return System.currentTimeMillis() - startTime;
     	}
     	return endTime - startTime;