Repository: oozie Updated Branches: refs/heads/master e6eec244e -> 53ad77290
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/53ad7729 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/53ad7729 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/53ad7729 Branch: refs/heads/master Commit: 53ad772907dc11153d4a7b812a2c0fcb83634432 Parents: e6eec24 Author: Purshotam Shah <[email protected]> Authored: Tue Nov 11 16:39:01 2014 -0800 Committer: Purshotam Shah <[email protected]> Committed: Tue Nov 11 16:39:01 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/53ad7729/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 b408549..bb0c7ed 100644 --- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java +++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java @@ -379,7 +379,9 @@ public class ShareLibService implements Service, Instrumentable { } } } - returnList.addAll(launcherLibMap.get(shareLibKey)); + if (launcherLibMap.get(shareLibKey) != null) { + returnList.addAll(launcherLibMap.get(shareLibKey)); + } } if (shareLibKey.equals(JavaActionExecutor.OOZIE_COMMON_LIBDIR)) { List<Path> sharelibList = getShareLibJars(shareLibKey);
