You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ry...@apache.org on 2015/04/24 19:57:49 UTC
oozie git commit: Amendment for OOZIE-2045 (ryota)
Repository: oozie
Updated Branches:
refs/heads/master bcd2684b2 -> 4fea9412f
Amendment for OOZIE-2045 (ryota)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/4fea9412
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/4fea9412
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/4fea9412
Branch: refs/heads/master
Commit: 4fea9412f1e12d97cf30c38d4693bb27290a1a16
Parents: bcd2684
Author: egashira <ry...@yahoo.com>
Authored: Thu Apr 23 19:20:48 2015 -0700
Committer: egashira <ry...@yahoo.com>
Committed: Fri Apr 24 10:55:32 2015 -0700
----------------------------------------------------------------------
.../java/org/apache/oozie/service/ShareLibService.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/4fea9412/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 51eb297..96c4be2 100644
--- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
@@ -784,13 +784,13 @@ public class ShareLibService implements Service, Instrumentable {
if (shareLibSymlinkMapping != null && !shareLibSymlinkMapping.isEmpty()
&& shareLibSymlinkMapping.values() != null && !shareLibSymlinkMapping.values().isEmpty()) {
StringBuffer bf = new StringBuffer();
- for (Entry<String, Map<Path, Path>> key : shareLibSymlinkMapping.entrySet())
- if (key.getKey() != null && !key.getValue().isEmpty()) {
- for (Path path : key.getValue().keySet()) {
- bf.append(path).append("(").append(key).append(")").append("=>")
- .append(shareLibSymlinkMapping.get(key).get(path)).append(",");
+ for (Entry<String, Map<Path, Path>> entry : shareLibSymlinkMapping.entrySet())
+ if (entry.getKey() != null && !entry.getValue().isEmpty()) {
+ for (Path path : entry.getValue().keySet()) {
+ bf.append(path).append("(").append(entry.getKey()).append(")").append("=>")
+ .append(shareLibSymlinkMapping.get(entry.getKey()) != null ? shareLibSymlinkMapping
+ .get(entry.getKey()).get(path) : "").append(",");
}
-
}
return bf.toString();
}