BATCHEE-127 fixed NPE if context not active
diff --git a/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/JobContextImpl.java b/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/JobContextImpl.java
index 79f51e5..5680dd3 100644
--- a/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/JobContextImpl.java
+++ b/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/JobContextImpl.java
@@ -23,6 +23,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicInteger;
+import javax.batch.runtime.context.JobContext;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.BeanManager;
@@ -44,7 +45,12 @@
@Override
protected Long currentKey() {
- return getContextResolver().getJobContext().getExecutionId();
+ JobContext jobContext = getContextResolver().getJobContext();
+ if (jobContext == null) {
+ return null;
+ }
+
+ return jobContext.getExecutionId();
}
diff --git a/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/StepContextImpl.java b/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/StepContextImpl.java
index e06b27b..8c530bb 100644
--- a/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/StepContextImpl.java
+++ b/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/StepContextImpl.java
@@ -20,6 +20,7 @@
import java.lang.annotation.Annotation;
+import javax.batch.runtime.context.StepContext;
import javax.enterprise.inject.Typed;
import javax.enterprise.inject.spi.BeanManager;
@@ -39,7 +40,12 @@
@Override
protected Long currentKey() {
- return getContextResolver().getStepContext().getStepExecutionId();
+ StepContext stepContext = getContextResolver().getStepContext();
+ if (stepContext == null) {
+ return null;
+ }
+
+ return stepContext.getStepExecutionId();
}
public void exitStep() {
