Merge pull request #385 from hanahmily/master

Fixed #384
apache · Jul 12, 2017 · 3fe29a8 · 3fe29a8
2 parents def983a + 1d1920c
commit 3fe29a8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,5 +1,10 @@
 ## 2.1.6
 
+### 缺陷修正
+
+1. [ISSUE #384](https://github.com/dangdangdotcom/elastic-job/issues/384) Cloud的执行器线程ContextClassLoader为空
+
+
 ## 2.1.5
 
 ### 新功能

diff --git a/...ob-cloud-executor/src/main/java/com/dangdang/ddframe/job/cloud/executor/TaskExecutor.java b/...ob-cloud-executor/src/main/java/com/dangdang/ddframe/job/cloud/executor/TaskExecutor.java
@@ -117,6 +117,7 @@ class TaskThread implements Runnable {
 
         @Override
         public void run() {
+            Thread.currentThread().setContextClassLoader(TaskThread.class.getClassLoader());
             executorDriver.sendStatusUpdate(Protos.TaskStatus.newBuilder().setTaskId(taskInfo.getTaskId()).setState(Protos.TaskState.TASK_RUNNING).build());
             Map<String, Object> data = SerializationUtils.deserialize(taskInfo.getData().toByteArray());
             ShardingContexts shardingContexts = (ShardingContexts) data.get("shardingContext");