Author: aconway
Date: Fri Apr 4 14:00:40 2008
New Revision: 644917
URL: http://svn.apache.org/viewvc?rev=644917&view=rev
Log:
src/qpid/amqp_0_10/Exception.h
- base classes for 0-10 exceptions
rubygen/0-10/exceptions.rb
- generated 0-10 exceptions
Added:
incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h (with props)
Modified:
incubator/qpid/trunk/qpid/cpp/rubygen/0-10/exceptions.rb
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h
Modified: incubator/qpid/trunk/qpid/cpp/rubygen/0-10/exceptions.rb
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/rubygen/0-10/exceptions.rb?rev=644917&r1=644916&r2=644917&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/rubygen/0-10/exceptions.rb (original)
+++ incubator/qpid/trunk/qpid/cpp/rubygen/0-10/exceptions.rb Fri Apr 4
14:00:40 2008
@@ -10,17 +10,37 @@
@dir="qpid/[EMAIL PROTECTED]"
end
+ def exceptions_for_enum(enum, base, ns, suffix="")
+ enum.choices.each { |c|
+ name=c.name.typename+suffix+"Exception"
+ genl
+ doxygen_comment { genl c.doc }
+ struct(name, "public #{base}") {
+ genl "#{name}(const std::string& msg=std::string())"
+ genl " : #{base}(#{ns}::#{c.name.shout}, msg) {}"
+ protected
+ genl "std::string getPrefix() const { return \"#{name}\"; }"
+ }
+ }
+ end
+
def gen_exceptions()
h_file("[EMAIL PROTECTED]/exceptions") {
- include "qpid/Exception"
- include "specification.h"
+ include "qpid/amqp_0_10/Exception"
namespace("[EMAIL PROTECTED]") {
- @amqp.class_("execution").domain("error-code").enum.choices.each { |c|
- name=c.name.typename+"Exception"
- struct(name, "public SessionException") {
- genl "#{name}(const std::string& msg=std::string()) :
SessionException(execution::#{c.name.shout}, msg) {}"
- }
- }
+ error_code = @amqp.class_("execution").domain("error-code").enum
+ exceptions_for_enum(error_code, "SessionAbortedException", "execution")
+ genl
+
+ detach_code = @amqp.class_("session").domain("detach-code").enum
+ exceptions_for_enum(detach_code, "SessionDetachedException",
"session", "Detached")
+
+ genl
+ exceptions_for_enum(detach_code, "SessionExpiredException", "session",
"Expired")
+ genl
+
+ close_code = @amqp.class_("connection").domain("close-code").enum
+ exceptions_for_enum(close_code, "ConnectionException", "connection")
}
}
end
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=644917&r1=644916&r2=644917&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Fri Apr 4 14:00:40 2008
@@ -275,6 +275,7 @@
qpid/assert.h \
qpid/DataDir.h \
qpid/Exception.h \
+ qpid/amqp_0_10/Exception.h \
qpid/Msg.h \
qpid/Options.h \
qpid/Plugin.h \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp?rev=644917&r1=644916&r2=644917&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp Fri Apr 4
14:00:40 2008
@@ -20,6 +20,7 @@
*/
#include "Connection.h"
#include "qpid/log/Statement.h"
+#include "qpid/amqp_0_10/exceptions.h"
namespace qpid {
namespace amqp_0_10 {
@@ -64,8 +65,9 @@
QPID_LOG(trace, "SENT [" << identifier << "]: " <<
frameQueue.front());
frameQueue.pop();
}
+ assert(frameQueue.empty() || frameQueue.front().size() <= size);
if (!frameQueue.empty() && frameQueue.front().size() > size)
- throw framing::ContentTooLargeException(QPID_MSG("Could not write
frame, too large for buffer."));
+ throw InternalErrorException(QPID_MSG("Could not write frame, too
large for buffer."));
return out.getPosition();
}
Added: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h?rev=644917&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h (added)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h Fri Apr 4
14:00:40 2008
@@ -0,0 +1,186 @@
+#ifndef QPID_AMQP_0_10_EXCEPTION_H
+#define QPID_AMQP_0_10_EXCEPTION_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/Exception.h"
+#include "qpid/amqp_0_10/specification_fwd.h"
+
+namespace qpid {
+namespace amqp_0_10 {
+
+/**
+ * Raised when the connection is unexpectedly closed. Sessions with
+ * non-0 timeout may be available for re-attachment on another connection.
+ */
+struct ConnectionException : public qpid::ConnectionException {
+ // FIXME aconway 2008-04-04: Merge qpid::ConnectionException
+ // into this when the old code is removed.
+ typedef connection::CloseCode Code;
+ ConnectionException(Code c, const std::string m)
+ : qpid::ConnectionException(c,m), code(c) {}
+ Code code;
+};
+
+/**
+ * Raised when a session is unexpectedly detached for any reason, or
+ * if an attempt is made to use a session that is not attached.
+ */
+struct SessionException : public qpid::SessionException {
+ // FIXME aconway 2008-04-04: should not have a code at this level.
+ // Leave in place till old preview code is gone.
+ SessionException(int code, const std::string& msg) :
qpid::SessionException(code, msg) {}
+};
+
+/** Raised when the state of a session has been destroyed */
+struct SessionDestroyedException : public SessionException {
+ // FIXME aconway 2008-04-04: should not have a code at this level.
+ // Leave in place till old preview code is gone.
+ SessionDestroyedException(int code, const std::string& msg) :
SessionException(code, msg){}
+};
+
+/** Raised when a session is destroyed due to an execution.exception */
+struct SessionAbortedException : public SessionDestroyedException {
+ typedef execution::ErrorCode Code;
+ SessionAbortedException(Code c, const std::string m)
+ : SessionDestroyedException(c, m), code(c) {}
+ Code code;
+};
+
+/**
+ * Raised when a session with 0 timeout is unexpectedly detached
+ * and therefore expires and is destroyed.
+ */
+struct SessionExpiredException : public SessionDestroyedException {
+ typedef session::DetachCode Code;
+ SessionExpiredException(Code c, const std::string m)
+ : SessionDestroyedException(c, m), code(c) {}
+ Code code;
+};
+
+/**
+ * Raised when a session with non-0 timeout is unexpectedly detached
+ * or if an attempt is made to use a session that is not attached.
+ *
+ * The session is not necessarily destroyed, it may be possible to
+ * re-attach.
+ */
+struct SessionDetachedException : public SessionException {
+ typedef session::DetachCode Code;
+ SessionDetachedException(Code c, const std::string m)
+ : SessionException(c, m), code(c) {}
+ Code code;
+};
+
+}} // namespace qpid::amqp_0_10
+
+#endif /*!QPID_AMQP_0_10_EXCEPTION_H*/
+#ifndef QPID_AMQP_0_10_EXCEPTION_H
+#define QPID_AMQP_0_10_EXCEPTION_H
+
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+#include "qpid/Exception.h"
+#include "qpid/amqp_0_10/specification_fwd.h"
+
+namespace qpid {
+namespace amqp_0_10 {
+
+/**
+ * Raised when the connection is unexpectedly closed. Sessions with
+ * non-0 timeout may be available for re-attachment on another connection.
+ */
+struct ConnectionException : public Exception {
+ typedef connection::CloseCode Code;
+ ConnectionException(Code c, const std::string m)
+ : Exception(m), code(c) {}
+ Code code;
+};
+
+/**
+ * Raised when a session is unexpectedly detached for any reason, or
+ * if an attempt is made to use a session that is not attached.
+ */
+struct SessionException : public Exception {
+ SessionException(const std::string& msg) : Exception(msg) {}
+};
+
+/** Raised when the state of a session has been destroyed */
+struct SessionDestroyedException : public SessionException {
+ SessionDestroyedException(const std::string& msg) :
SessionException(msg){}
+};
+
+/** Raised when a session is destroyed due to an execution.exception */
+struct SessionAbortedException : public SessionDestroyedException {
+ typedef execution::ErrorCode Code;
+ SessionAbortedException(Code c, const std::string m)
+ : SessionDestroyedException(m), code(c) {}
+ Code code;
+};
+
+/**
+ * Raised when a session with 0 timeout is unexpectedly detached
+ * and therefore expires and is destroyed.
+ */
+struct SessionExpiredException : public SessionDestroyedException {
+ typedef session::DetachCode Code;
+ SessionExpiredException(Code c, const std::string m)
+ : SessionDestroyedException(m), code(c) {}
+ Code code;
+};
+
+/**
+ * Raised when a session with non-0 timeout is unexpectedly detached
+ * or if an attempt is made to use a session that is not attached.
+ *
+ * The session is not necessarily destroyed, it may be possible to
+ * re-attach.
+ */
+struct SessionDetachedException : public SessionException {
+ typedef session::DetachCode Code;
+ SessionDetachedException(Code c, const std::string m)
+ : SessionException(m), code(c) {}
+ Code code;
+};
+
+}} // namespace qpid::amqp_0_10
+
+#endif /*!QPID_AMQP_0_10_EXCEPTION_H*/
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Exception.h
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.cpp?rev=644917&r1=644916&r2=644917&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.cpp Fri Apr 4
14:00:40 2008
@@ -18,7 +18,6 @@
* under the License.
*
*/
-#include "qpid/amqp_0_10/exceptions.h"
#include "Map.h"
#include <ostream>
@@ -60,10 +59,6 @@
uint32_t Map::contentSize() const {
// FIXME aconway 2008-04-03: preview to 0-10 mapping: +4 for count.
return /*4 +*/ Codec::Size()(begin(), end());
-}
-
-void Map::throwInvalidArg() {
- throw InvalidArgumentException("Invalid map encoding");
}
}} // namespace qpid::amqp_0_10
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h?rev=644917&r1=644916&r2=644917&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Map.h Fri Apr 4 14:00:40
2008
@@ -91,7 +91,6 @@
template <class S> void decode(S& s);
private:
- static void throwInvalidArg();
uint32_t contentSize() const;
};
