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 2014/03/31 18:49:24 UTC

git commit: OOZIE-1732 Sharelib instrumentation fails if sharelib.system.libpath is not created (ryota)

Repository: oozie
Updated Branches:
  refs/heads/master c082d84b8 -> 81f6c747a


OOZIE-1732 Sharelib instrumentation fails if sharelib.system.libpath is not created (ryota)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/81f6c747
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/81f6c747
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/81f6c747

Branch: refs/heads/master
Commit: 81f6c747a6a334c0ce08cf1b558dfac7ae811ce3
Parents: c082d84
Author: egashira <ry...@yahoo.com>
Authored: Mon Mar 31 09:43:45 2014 -0700
Committer: egashira <ry...@yahoo.com>
Committed: Mon Mar 31 09:43:45 2014 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/oozie/service/ShareLibService.java   | 7 +++++--
 release-log.txt                                               | 1 +
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/81f6c747/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 791d1a9..89939f1 100644
--- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java
+++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java
@@ -603,8 +603,11 @@ public class ShareLibService implements Service, Instrumentable {
             public String getValue() {
                 String sharelibPath = "(unavailable)";
                 try {
-                    sharelibPath = getLatestLibPath(services.get(WorkflowAppService.class).getSystemLibPath(), SHARED_LIB_PREFIX)
-                        .toUri().toString();
+                    Path libPath = getLatestLibPath(services.get(WorkflowAppService.class).getSystemLibPath(),
+                            SHARED_LIB_PREFIX);
+                    if (libPath != null) {
+                        sharelibPath = libPath.toUri().toString();
+                    }
                 }
                 catch (IOException ioe) {
                     // ignore exception because we're just doing instrumentation

http://git-wip-us.apache.org/repos/asf/oozie/blob/81f6c747/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index c987750..a65c8af 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 4.1.0 release (trunk - unreleased)
 
+OOZIE-1732 Sharelib instrumentation fails if sharelib.system.libpath is not created (ryota)
 OOZIE-1692 modify log message when checking completion of child job in Map-Reduce action (ryota)
 OOZIE-1734 Oozie returned 500 Internal Server error when user passes invalid request (checha via rkanter)
 OOZIE-1593 Oozie HCatCredential provider needs to include hadoop rpc protection to work with encrypted secure clusters (bzhang)