svn commit: r1497997 - /oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java

[mona]

Author: mona
Date: Sat Jun 29 18:35:06 2013
New Revision: 1497997

URL: http://svn.apache.org/r1497997
Log:
Sync CoordKillXCommand with trunk code

Modified:
    
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java

Modified: 
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
URL: 
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java?rev=1497997&r1=1497996&r2=1497997&view=diff
==============================================================================
--- 
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
 (original)
+++ 
oozie/branches/branch-4.0/core/src/main/java/org/apache/oozie/command/coord/CoordKillXCommand.java
 Sat Jun 29 18:35:06 2013
@@ -34,6 +34,7 @@ import org.apache.oozie.executor.jpa.Bul
 import org.apache.oozie.executor.jpa.CoordJobGetActionsNotCompletedJPAExecutor;
 import org.apache.oozie.executor.jpa.CoordJobGetJPAExecutor;
 import org.apache.oozie.executor.jpa.JPAExecutorException;
+import org.apache.oozie.service.EventHandlerService;
 import org.apache.oozie.service.JPAService;
 import org.apache.oozie.service.Services;
 import org.apache.oozie.util.LogUtils;
@@ -113,7 +114,8 @@ public class CoordKillXCommand extends K
             // set pending to false
             action.setPending(0);
         }
-        if (prevStatus != CoordinatorAction.Status.RUNNING && prevStatus != 
CoordinatorAction.Status.SUSPENDED) {
+        if (EventHandlerService.isEnabled() && prevStatus != 
CoordinatorAction.Status.RUNNING
+                && prevStatus != CoordinatorAction.Status.SUSPENDED) {
             CoordinatorXCommand.generateEvent(action, coordJob.getUser(), 
coordJob.getAppName(), null);
         }
         action.setLastModifiedTime(new Date());