/* Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.camunda.bpm.engine.impl.cmd;

import org.camunda.bpm.engine.impl.interceptor.CommandContext;
import org.camunda.bpm.engine.impl.persistence.entity.JobEntity;

/**
 * @author Tom Baeyens
 * @author Daniel Meyer
 */
public class DecrementJobRetriesCmd extends JobRetryCmd {

  public DecrementJobRetriesCmd(String jobId, Throwable exception) {
    super(jobId, exception);
  }

  public Object execute(CommandContext commandContext) {
    JobEntity job = getJob();

    job.unlock();
    logException(job);
    decrementRetries(job);
    notifyAcquisition(commandContext);

    return null;
  }

}

@@ -553,17 +553,16 @@
 se.%0A */%0A
-%0A
 package 
@@ -595,16 +595,72 @@
 l.cmd;%0A%0A
+import org.camunda.bpm.engine.impl.ProcessEngineLogger;%0A
 import o
@@ -714,16 +714,82 @@
 ontext;%0A
+import org.camunda.bpm.engine.impl.jobexecutor.JobExecutorLogger;%0A
 import o
@@ -960,16 +960,105 @@
 yCmd %7B%0A%0A
+  private final static JobExecutorLogger LOG = ProcessEngineLogger.JOB_EXECUTOR_LOGGER;%0A%0A
   public
@@ -1239,21 +1239,45 @@
 tJob();%0A
-%0A
+    if (job != null) %7B%0A 
     
+ 
 job.unlo
@@ -1278,24 +1278,26 @@
 b.unlock();%0A
+  
     logExcep
@@ -1311,16 +1311,18 @@
 b);%0A    
+  
 decremen
@@ -1340,16 +1340,18 @@
 b);%0A    
+ 
+ 
 notifyAc
@@ -1377,16 +1377,75 @@
 ntext);%0A
+    %7D else %7B%0A      LOG.debugFailedJobNotFound(jobId);%0A    %7D
 %0A    ret

add not null check for job