You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@batchee.apache.org by rs...@apache.org on 2017/11/28 17:25:04 UTC
incubator-batchee git commit: BATCHEE-127 fixed NPE if context not
active
Repository: incubator-batchee
Updated Branches:
refs/heads/master 38f3e9842 -> 92ca9f78a
BATCHEE-127 fixed NPE if context not active
Project: http://git-wip-us.apache.org/repos/asf/incubator-batchee/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-batchee/commit/92ca9f78
Tree: http://git-wip-us.apache.org/repos/asf/incubator-batchee/tree/92ca9f78
Diff: http://git-wip-us.apache.org/repos/asf/incubator-batchee/diff/92ca9f78
Branch: refs/heads/master
Commit: 92ca9f78a0b42ee347a3448395ffe42d2e3c9b42
Parents: 38f3e98
Author: Reinhard Sandtner <rs...@apache.org>
Authored: Tue Nov 28 18:24:19 2017 +0100
Committer: Reinhard Sandtner <rs...@apache.org>
Committed: Tue Nov 28 18:24:19 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/batchee/cdi/impl/JobContextImpl.java | 8 +++++++-
.../java/org/apache/batchee/cdi/impl/StepContextImpl.java | 8 +++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/92ca9f78/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/JobContextImpl.java
----------------------------------------------------------------------
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.ConcurrentHashMap;
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 @@ public class JobContextImpl extends BaseContext {
@Override
protected Long currentKey() {
- return getContextResolver().getJobContext().getExecutionId();
+ JobContext jobContext = getContextResolver().getJobContext();
+ if (jobContext == null) {
+ return null;
+ }
+
+ return jobContext.getExecutionId();
}
http://git-wip-us.apache.org/repos/asf/incubator-batchee/blob/92ca9f78/extensions/cdi/src/main/java/org/apache/batchee/cdi/impl/StepContextImpl.java
----------------------------------------------------------------------
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 org.apache.batchee.cdi.scope.StepScoped;
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 @@ public class StepContextImpl extends BaseContext {
@Override
protected Long currentKey() {
- return getContextResolver().getStepContext().getStepExecutionId();
+ StepContext stepContext = getContextResolver().getStepContext();
+ if (stepContext == null) {
+ return null;
+ }
+
+ return stepContext.getStepExecutionId();
}
public void exitStep() {