You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by tn...@apache.org on 2015/10/18 01:37:19 UTC
mesos git commit: Fixed MESOS_NATIVE_JAVA_LIBRARY not set on
MesosContainerizer.
Repository: mesos
Updated Branches:
refs/heads/master f67ea3c2b -> 56510afe1
Fixed MESOS_NATIVE_JAVA_LIBRARY not set on MesosContainerizer.
Review: https://reviews.apache.org/r/39412
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/56510afe
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/56510afe
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/56510afe
Branch: refs/heads/master
Commit: 56510afe149758a69a5a714dfaab16111dd0d9c3
Parents: f67ea3c
Author: Gilbert Song <gi...@mesoshere.io>
Authored: Sat Oct 17 23:03:27 2015 +0000
Committer: Timothy Chen <tn...@gmail.com>
Committed: Sat Oct 17 23:36:55 2015 +0000
----------------------------------------------------------------------
src/slave/containerizer/containerizer.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/56510afe/src/slave/containerizer/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/containerizer.cpp b/src/slave/containerizer/containerizer.cpp
index e710a08..0675336 100644
--- a/src/slave/containerizer/containerizer.cpp
+++ b/src/slave/containerizer/containerizer.cpp
@@ -278,7 +278,7 @@ map<string, string> executorEnvironment(
// case the framework wants to override).
// TODO(tillt): Adapt library towards JNI specific name once libmesos
// has been split.
- if (os::getenv("MESOS_NATIVE_JAVA_LIBRARY").isNone()) {
+ if (environment.count("MESOS_NATIVE_JAVA_LIBRARY") == 0) {
string path =
#ifdef __APPLE__
LIBDIR "/libmesos-" VERSION ".dylib";
@@ -293,7 +293,7 @@ map<string, string> executorEnvironment(
// Also add MESOS_NATIVE_LIBRARY if it's not already present.
// This environment variable is kept for offering non JVM-based
// frameworks a more compact and JNI independent library.
- if (os::getenv("MESOS_NATIVE_LIBRARY").isNone()) {
+ if (environment.count("MESOS_NATIVE_LIBRARY") == 0) {
string path =
#ifdef __APPLE__
LIBDIR "/libmesos-" VERSION ".dylib";