command/Error: support nested exceptions

570dcb63 · Max Kellermann · 19e43087 · 570dcb63
Commit 570dcb63 authored Dec 28, 2015 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

CommandError.cxx src/command/CommandError.cxx +6 -1

No files found.
--- a/src/command/CommandError.cxx
+++ b/src/command/CommandError.cxx
@@ -171,7 +171,12 @@ ToAck(std::exception_ptr ep)
 	} catch (const std::system_error &e) {
 		return ACK_ERROR_SYSTEM;
 	} catch (...) {
-		return ACK_ERROR_UNKNOWN;
+		try {
+			std::rethrow_if_nested(ep);
+			return ACK_ERROR_UNKNOWN;
+		} catch (...) {
+			return ToAck(std::current_exception());
+		}
 	}
 }