Repository: oozie Updated Branches: refs/heads/branch-4.1 184a5e3ed -> 05eb2cd3b
Amendment patch OOZIE-1973 ConcurrentModificationException in Sharelib service Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/05eb2cd3 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/05eb2cd3 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/05eb2cd3 Branch: refs/heads/branch-4.1 Commit: 05eb2cd3bacd6e3dd4f33659ae15197b5395d3d4 Parents: 184a5e3 Author: Purshotam Shah <[email protected]> Authored: Tue Nov 11 16:25:40 2014 -0800 Committer: Purshotam Shah <[email protected]> Committed: Tue Nov 11 16:25:40 2014 -0800 ---------------------------------------------------------------------- core/src/main/java/org/apache/oozie/service/ShareLibService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/05eb2cd3/core/src/main/java/org/apache/oozie/service/ShareLibService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/ShareLibService.java b/core/src/main/java/org/apache/oozie/service/ShareLibService.java index 4b51dd9..81a2f42 100644 --- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java +++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java @@ -329,7 +329,9 @@ public class ShareLibService implements Service, Instrumentable { } } } - returnList.addAll(launcherLibMap.get(actionKey)); + if (launcherLibMap.get(actionKey) != null) { + returnList.addAll(launcherLibMap.get(actionKey)); + } } if (actionKey.equals(JavaActionExecutor.OOZIE_COMMON_LIBDIR)) { List<Path> sharelibList = getShareLibJars(actionKey);
