You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/04/25 23:36:02 UTC
[21/48] mesos git commit: Ignored empty NetworkSettings.IPAddress
from docker inspect.
Ignored empty NetworkSettings.IPAddress from docker inspect.
Review: https://reviews.apache.org/r/43001
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4ecca83c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4ecca83c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4ecca83c
Branch: refs/heads/0.27.x
Commit: 4ecca83ce6ad6ec55b912dbaa06867f773b5a1e9
Parents: 46b4769
Author: Jie Yu <yu...@gmail.com>
Authored: Fri Jan 29 17:24:14 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Mon Feb 15 16:15:23 2016 -0500
----------------------------------------------------------------------
src/docker/docker.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4ecca83c/src/docker/docker.cpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp
index 4d2f1fa..a831726 100755
--- a/src/docker/docker.cpp
+++ b/src/docker/docker.cpp
@@ -311,7 +311,10 @@ Try<Docker::Container> Docker::Container::create(const string& output)
ipAddressValue.error());
}
- string ipAddress = ipAddressValue.get().value;
+ Option<string> ipAddress;
+ if (!ipAddressValue->value.empty()) {
+ ipAddress = ipAddressValue->value;
+ }
return Docker::Container(output, id, name, optionalPid, started, ipAddress);
}