2 files changed, 38 insertions, 14 deletions
diff --git a/cpp/src/qpid/Exception.cpp b/cpp/src/qpid/Exception.cpp
index 07f157cfc3..17f0d5029c 100644
--- a/cpp/src/qpid/Exception.cpp
+++ b/cpp/src/qpid/Exception.cpp
@@ -32,20 +32,31 @@ std::string strError(int err) {
     return std::string(strerror_r(err, buf, sizeof(buf)));
 }
 
-Exception::Exception(const std::string& s) throw() : msg(s) {
-    QPID_LOG(warning, "Exception: " << msg);
+Exception::Exception(const std::string& msg,
+                     const std::string& nm,
+                     uint16_t cd) throw()
+    : message(msg), name(nm), code(cd),
+      whatStr((name.empty() ? "" : name + ": ")+ msg)
+{
+    QPID_LOG(warning, "Exception: " << whatStr);
 }
 
 Exception::~Exception() throw() {}
 
-std::string Exception::str() const throw() {
-    if (msg.empty())
-        const_cast<std::string&>(msg).assign(typeid(*this).name());
-    return msg;
+std::string Exception::getMessage() const throw() { return message; }
+
+std::string Exception::getName() const throw() {
+    return name.empty() ? typeid(*this).name() : name;
 }
 
-const char* Exception::what() const throw() { return str().c_str(); }
+uint16_t Exception::getCode() const throw() { return code; }
+
+const char* Exception::what() const throw() {
+    if (whatStr.empty()) return typeid(*this).name();
+    else return whatStr.c_str();
+}
 
-const std::string ClosedException::CLOSED_MESSAGE("Closed");
+ClosedException::ClosedException(const std::string& msg)
+  : Exception(msg, "ClosedException") {}
 
 } // namespace qpid
diff --git a/cpp/src/qpid/Exception.h b/cpp/src/qpid/Exception.h
index 57c7a21234..00365018ba 100644
--- a/cpp/src/qpid/Exception.h
+++ b/cpp/src/qpid/Exception.h
@@ -40,13 +40,27 @@ std::string strError(int err);
 class Exception : public std::exception
 {
   public:
-    explicit Exception(const std::string& str=std::string()) throw();
+    explicit Exception(const std::string& message=std::string(),
+                       const std::string& name=std::string(),
+                       uint16_t code=0) throw();
+    
     virtual ~Exception() throw();
+
+    // returns "name: message"
+    virtual const char* what() const throw();
+
+    virtual std::string getName() const throw();
+    virtual std::string getMessage() const throw();
+    virtual uint16_t getCode() const throw();
+
+    // FIXME aconway 2008-02-21: backwards compat, remove?
+    std::string str() const throw() { return getMessage(); } 
     
-    virtual const char *what() const throw();
-    virtual std::string str() const throw();
   private:
-    std::string msg;
+    const std::string message;
+    const std::string name;
+    const uint16_t code;
+    const std::string whatStr;
 };
 
 struct ChannelException : public Exception {
@@ -62,8 +76,7 @@ struct ConnectionException : public Exception {
 };
 
 struct ClosedException : public Exception {
-    static const std::string CLOSED_MESSAGE;
-    ClosedException(const std::string& msg=CLOSED_MESSAGE) : Exception(msg) {}
+    ClosedException(const std::string& msg=std::string());
 };
 
 } // namespace qpid