Merge branch 'v0.19.x'

2014-12-26 14:40:32 +01:00
parent d37811f177 163597ef69
commit 412bedb697
30 changed files with 147 additions and 52 deletions
--- a/src/storage/plugins/NfsStorage.cxx
+++ b/src/storage/plugins/NfsStorage.cxx
@@ -288,7 +288,7 @@ NfsStorage::GetInfo(const char *uri_utf8, gcc_unused bool follow,
 		return false;

 	if (!WaitConnected(error))
-		return nullptr;
+		return false;

 	NfsGetInfoOperation operation(*connection, path.c_str(), info);
 	return operation.Run(error);