Fixed re-entry problem with exceptions throw in logger code.

 - src/qpid/log/Logger.cpp
 - src/qpid/log/Statement.cpp


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@615075 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 3 deletions

diff --git a/qpid/cpp/src/qpid/log/Logger.cpp b/qpid/cpp/src/qpid/log/Logger.cpp
index de3f8f5bee..b51bb0427b 100644
--- a/qpid/cpp/src/qpid/log/Logger.cpp
+++ b/qpid/cpp/src/qpid/log/Logger.cpp
@@ -29,6 +29,7 @@
 #include <sstream>
 #include <fstream>
 #include <iomanip>
+#include <stdexcept>
 #include <syslog.h>
 
 
@@ -50,7 +51,7 @@ struct OstreamOutput : public Logger::Output {
         : out(new ofstream(file.c_str())), mine(out)
     {
         if (!out->good())
-            throw Exception("Can't open log file: "+file);
+            throw std::runtime_error("Can't open log file: "+file);
     }
 
     void log(const Statement&, const std::string& m) {
diff --git a/qpid/cpp/src/qpid/log/Statement.cpp b/qpid/cpp/src/qpid/log/Statement.cpp
index de130bc455..949927a32b 100644
--- a/qpid/cpp/src/qpid/log/Statement.cpp
+++ b/qpid/cpp/src/qpid/log/Statement.cpp
@@ -18,7 +18,7 @@
 
 #include "Statement.h"
 #include "Logger.h"
-#include "qpid/Exception.h"
+#include <stdexcept>
 #include <syslog.h>
 
 namespace qpid {
@@ -49,7 +49,7 @@ Level LevelTraits::level(const char* name) {
         if (strcmp(names[i], name)==0)
             return Level(i);
     }
-    throw qpid::Exception(std::string("Invalid log level name: ")+name);
+    throw std::runtime_error(std::string("Invalid log level name: ")+name);
 }
 
 const char* LevelTraits::name(Level l) {