Nabble - ActiveMQ

svn commit: r834931 [2/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/commands/ main/activemq/core/ main/activemq/io/ main/cms/ main/decaf/internal/io/ main/decaf/io/ main/decaf/lang/ main/decaf/net/ test/ test/activemq/comm...

2009-11-11T08:01:48Z

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h Wed Nov 11 16:01:47 2009
@@ -24,7 +24,6 @@
#endif

#include <activemq/util/Config.h>
-#include <activemq/util/PrimitiveList.h>
#include <activemq/commands/ActiveMQMessage.h>
#include <activemq/commands/ActiveMQMessageTemplate.h>
#include <cms/StreamMessage.h>
@@ -33,6 +32,9 @@
#include <cms/MessageFormatException.h>
#include <cms/MessageEOFException.h>
#include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/io/DataInputStream.h>
+#include <decaf/io/DataOutputStream.h>
+#include <decaf/io/ByteArrayOutputStream.h>
#include <string>
#include <memory>

@@ -43,12 +45,11 @@
public ActiveMQMessageTemplate< cms::StreamMessage > {
private:

- // Map Structure to hold unmarshaled Map Data
- mutable std::auto_ptr<util::PrimitiveList> list;
+ mutable std::auto_ptr<decaf::io::ByteArrayOutputStream> bytesOut;
+ mutable std::auto_ptr<decaf::io::DataInputStream> dataIn;
+ mutable std::auto_ptr<decaf::io::DataOutputStream> dataOut;

- // When Message is readable this is the index of the next
- // element to be read.
- mutable std::size_t currentPos;
+ mutable int remainingBytes;

public:

@@ -91,20 +92,9 @@
virtual bool equals( const DataStructure* value ) const;

/**
- * Determine if this object is aware of marshaling and should have
- * its before and after marshaling methods called. Defaults to false.
- * @returns true if aware of marshaling
+ * Store the Data that was written to the stream before a send
*/
- virtual bool isMarshalAware() const {
- return true;
- }
-
- /**
- * Perform any processing needed before an marshal
- * @param wireFormat - the OpenWireFormat object in use.
- */
- virtual void beforeMarshal( wireformat::WireFormat* wireFormat )
- throw ( decaf::io::IOException );
+ virtual void onSend();

public: // CMS Message

@@ -121,11 +111,7 @@
* Clears out the body of the message. This does not clear the
* headers or properties.
*/
- virtual void clearBody() throw( cms::CMSException ) {
-
- // Invoke base class's version.
- ActiveMQMessageTemplate<cms::StreamMessage>::clearBody();
- }
+ virtual void clearBody() throw( cms::CMSException );

public: // CMS Stream Message

@@ -137,37 +123,63 @@
virtual void reset() throw ( cms::CMSException );

/**
- * Reads a Boolean from the Bytes message stream
+ * Reads a Boolean from the Stream message stream
* @returns boolean value from stream
- * @throws CMSException
- */
- virtual bool readBoolean() const throw ( cms::CMSException );
+ *
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual bool readBoolean() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a boolean to the bytes message stream as a 1-byte value.
+ * Writes a boolean to the Stream message stream as a 1-byte value.
* The value true is written as the value (byte)1; the value false
* is written as the value (byte)0.
- * @param value - boolean to write to the stream
- * @throws CMSException
+ *
+ * @param value
+ * boolean to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeBoolean( bool value ) throw ( cms::CMSException );
+ virtual void writeBoolean( bool value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a Byte from the Bytes message stream
+ * Reads a Byte from the Stream message stream
+ *
* @returns unsigned char value from stream
- * @throws CMSException
- */
- virtual unsigned char readByte() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual unsigned char readByte() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a byte to the bytes message stream as a 1-byte value
- * @param value - byte to write to the stream
- * @throws CMSException
+ * Writes a byte to the Stream message stream as a 1-byte value
+ *
+ * @param value
+ * byte to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeByte( unsigned char value ) throw ( cms::CMSException );
+ virtual void writeByte( unsigned char value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a byte array from the bytes message stream.
+ * Reads a byte array from the Stream message stream.
*
* If the length of vector value is less than the number of bytes
* remaining to be read from the stream, the vector should be filled. A
@@ -179,26 +191,39 @@
* length of the vector, indicating that there are no more bytes left to
* be read from the stream. The next read of the stream returns -1.
*
- * @param value - buffer to place data in
+ * @param value
+ * buffer to place data in
* @returns the total number of bytes read into the buffer, or -1 if
* there is no more data because the end of the stream has
* been reached
- * @throws CMSException if an error occurs.
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
*/
virtual std::size_t readBytes( std::vector<unsigned char>& value ) const
- throw ( cms::CMSException );
+ throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a byte array to the bytes message stream using the vector
+ * Writes a byte array to the Stream message stream using the vector
* size as the number of bytes to write.
- * @param value - bytes to write to the stream
- * @throws CMSException
- */
- virtual void writeBytes(
- const std::vector<unsigned char>& value ) throw ( cms::CMSException );
+ *
+ * @param value
+ * bytes to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
+ */
+ virtual void writeBytes( const std::vector<unsigned char>& value )
+ throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a portion of the bytes message stream.
+ * Reads a portion of the Stream message stream.
*
* If the length of array value is less than the number of bytes
* remaining to be read from the stream, the array should be filled. A
@@ -211,167 +236,268 @@
* be read from the stream. The next read of the stream returns -1.
*
* If length is negative, or length is greater than the length of the
- * array value, then an IndexOutOfBoundsException is thrown. No bytes
+ * array value, then an CMSException is thrown. No bytes
* will be read from the stream for this exception case.
*
- * @param buffer - the buffer into which the data is read
- * @param length - the number of bytes to read; must be less than or
- * equal to value.length
+ * @param buffer
+ * the buffer into which the data is read
+ * @param length
+ * the number of bytes to read; must be less than or equal to
+ * value.length
* @returns the total number of bytes read into the buffer, or -1 if
* there is no more data because the end of the stream has
* been reached
- * @throws CMSException
- */
- virtual std::size_t readBytes( unsigned char*& buffer, std::size_t length ) const
- throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual std::size_t readBytes( unsigned char* buffer, std::size_t length ) const
+ throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a portion of a byte array to the bytes message stream.
+ * Writes a portion of a byte array to the Stream message stream.
* size as the number of bytes to write.
- * @param value - bytes to write to the stream
- * @param offset - the initial offset within the byte array
- * @param length - the number of bytes to use
- * @throws CMSException
- */
- virtual void writeBytes( const unsigned char* value,
- std::size_t offset,
- std::size_t length ) throw ( cms::CMSException );
+ *
+ * @param value
+ * bytes to write to the stream
+ * @param offset
+ * the initial offset within the byte array
+ * @param length
+ * the number of bytes to use
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
+ */
+ virtual void writeBytes( const unsigned char* value, std::size_t offset, std::size_t length )
+ throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a Char from the Bytes message stream
+ * Reads a Char from the Stream message stream
+ *
* @returns char value from stream
- * @throws CMSException
- */
- virtual char readChar() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual char readChar() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a char to the bytes message stream as a 1-byte value
- * @param value - char to write to the stream
- * @throws CMSException
+ * Writes a char to the Stream message stream as a 1-byte value
+ *
+ * @param value
+ * char to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeChar( char value ) throw ( cms::CMSException );
+ virtual void writeChar( char value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a 32 bit float from the Bytes message stream
+ * Reads a 32 bit float from the Stream message stream
+ *
* @returns double value from stream
- * @throws CMSException
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual float readFloat() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );
+
+ /**
+ * Writes a float to the Stream message stream as a 4 byte value
+ * @param value
+ * float to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual float readFloat() const throw ( cms::CMSException );
+ virtual void writeFloat( float value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Writes a float to the bytes message stream as a 4 byte value
- * @param value - float to write to the stream
- * @throws CMSException
- */
- virtual void writeFloat( float value ) throw ( cms::CMSException );
-
- /**
- * Reads a 64 bit double from the Bytes message stream
+ * Reads a 64 bit double from the Stream message stream
+ *
* @returns double value from stream
- * @throws CMSException
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual double readDouble() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );
+
+ /**
+ * Writes a double to the Stream message stream as a 8 byte value
+ * @param value
+ * double to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual double readDouble() const throw ( cms::CMSException );
+ virtual void writeDouble( double value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Writes a double to the bytes message stream as a 8 byte value
- * @param value - double to write to the stream
- * @throws CMSException
- */
- virtual void writeDouble( double value ) throw ( cms::CMSException );
-
- /**
- * Reads a 16 bit signed short from the Bytes message stream
+ * Reads a 16 bit signed short from the Stream message stream
+ *
* @returns short value from stream
- * @throws CMSException
- */
- virtual short readShort() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual short readShort() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a signed short to the bytes message stream as a 2 byte value
- * @param value - signed short to write to the stream
- * @throws CMSException
+ * Writes a signed short to the Stream message stream as a 2 byte value
+ *
+ * @param value
+ * signed short to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeShort( short value ) throw ( cms::CMSException );
+ virtual void writeShort( short value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a 16 bit unsigned short from the Bytes message stream
+ * Reads a 16 bit unsigned short from the Stream message stream
+ *
* @returns unsigned short value from stream
- * @throws CMSException
- */
- virtual unsigned short readUnsignedShort() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual unsigned short readUnsignedShort() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a unsigned short to the bytes message stream as a 2 byte value
- * @param value - unsigned short to write to the stream
- * @throws CMSException
+ * Writes a unsigned short to the Stream message stream as a 2 byte value
+ *
+ * @param value
+ * unsigned short to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeUnsignedShort( unsigned short value ) throw ( cms::CMSException );
+ virtual void writeUnsignedShort( unsigned short value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a 32 bit signed intger from the Bytes message stream
+ * Reads a 32 bit signed integer from the Stream message stream
+ *
* @returns int value from stream
- * @throws CMSException
- */
- virtual int readInt() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual int readInt() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a signed int to the bytes message stream as a 4 byte value
- * @param value - signed int to write to the stream
- * @throws CMSException
+ * Writes a signed int to the Stream message stream as a 4 byte value
+ *
+ * @param value
+ * signed int to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeInt( int value ) throw ( cms::CMSException );
+ virtual void writeInt( int value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads a 64 bit long from the Bytes message stream
+ * Reads a 64 bit long from the Stream message stream
+ *
* @returns long long value from stream
- * @throws CMSException
- */
- virtual long long readLong() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual long long readLong() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes a long long to the bytes message stream as a 8 byte value
- * @param value - signed long long to write to the stream
- * @throws CMSException
+ * Writes a long long to the Stream message stream as a 8 byte value
+ *
+ * @param value
+ * signed long long to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeLong( long long value ) throw ( cms::CMSException );
+ virtual void writeLong( long long value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

/**
- * Reads an ASCII String from the Bytes message stream
+ * Reads an ASCII String from the Stream message stream
+ *
* @returns String from stream
- * @throws CMSException
- */
- virtual std::string readString() const throw ( cms::CMSException );
+ * @throw CMSException - if the CMS provider fails to read the message
+ * due to some internal error.
+ * @throw MessageEOFException - if unexpected end of message stream has been reached.
+ * @throw MessageFormatException - if this type conversion is invalid.
+ * @throw MessageNotReadableException - if the message is in write-only mode.
+ */
+ virtual std::string readString() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException );

/**
- * Writes an ASCII String to the Bytes message stream
- * @param value - String to write to the stream
- * @throws CMSException
+ * Writes an ASCII String to the Stream message stream
+ *
+ * @param value
+ * String to write to the stream
+ * @throws CMSException - if the CMS provider fails to write the message due
+ * to some internal error.
+ * @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeString( const std::string& value ) throw ( cms::CMSException );
+ virtual void writeString( const std::string& value )throw ( cms::MessageNotWriteableException,
+ cms::CMSException );

- protected:
+ private:

- /**
- * Throws an exception if in write-only mode.
- * @throws CMSException.
- */
- void checkWriteOnlyBody() const throw( cms::CMSException );
+ void storeContent();

- /**
- * Fetches a reference to this objects PrimitiveList, if one needs
- * to be created or unmarshaled, this will perform the correct steps.
- * @returns reference to a PrimtiveList.
- */
- util::PrimitiveList& getList()
- throw ( decaf::lang::exceptions::NullPointerException );
- const util::PrimitiveList& getList() const
- throw ( decaf::lang::exceptions::NullPointerException );
+ void initializeReading() const;

- /**
- * Performs the unmarshal on the List if needed, otherwise just returns.
- */
- void checkListIsUnmarshalled() const
- throw ( decaf::lang::exceptions::NullPointerException );
+ void initializeWriting();

};

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp Wed Nov 11 16:01:47 2009
@@ -100,7 +100,7 @@
////////////////////////////////////////////////////////////////////////////////
void ActiveMQTextMessage::setText( const std::string& msg ) throw( cms::CMSException ) {
try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
std::vector<unsigned char>& content = getContent();
content.clear();
decaf::io::ByteArrayOutputStream bos( content );

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.h Wed Nov 11 16:01:47 2009
@@ -216,6 +216,11 @@
virtual bool isExpired() const;

/**
+ * Allows derived Message classes to perform tasks before a message is sent.
+ */
+ virtual void onSend() {}
+
+ /**
* Gets a reference to the Message's Properties object, allows the derived
* classes to get and set their own specific properties.
*

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp Wed Nov 11 16:01:47 2009
@@ -693,6 +693,7 @@
// around beyond the point that send returns.
Pointer<commands::Message> msgCopy( amqMessage->cloneDataStructure() );

+ msgCopy->onSend();
msgCopy->setProducerId( producer->getProducerInfo().getProducerId() );

if( this->connection->getSendTimeout() <= 0 &&

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.cpp Wed Nov 11 16:01:47 2009
@@ -36,7 +36,7 @@
LoggingInputStream::~LoggingInputStream() {}

////////////////////////////////////////////////////////////////////////////////
-unsigned char LoggingInputStream::read() throw ( IOException ) {
+int LoggingInputStream::read() throw ( IOException ) {
try {

unsigned char c = FilterInputStream::read();

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.h Wed Nov 11 16:01:47 2009
@@ -50,7 +50,7 @@
* @return The next byte.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( decaf::io::IOException );
+ virtual int read() throw ( decaf::io::IOException );

/**
* Reads an array of bytes from the buffer. Blocks until

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h Wed Nov 11 16:01:47 2009
@@ -73,7 +73,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual bool readBoolean() const throw ( cms::CMSException ) = 0;
+ virtual bool readBoolean() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a boolean to the Stream message stream as a 1-byte value.
@@ -86,7 +89,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeBoolean( bool value ) throw ( cms::CMSException ) = 0;
+ virtual void writeBoolean( bool value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a Byte from the Stream message stream
@@ -98,7 +102,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual unsigned char readByte() const throw ( cms::CMSException ) = 0;
+ virtual unsigned char readByte() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a byte to the Stream message stream as a 1-byte value
@@ -109,7 +116,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeByte( unsigned char value ) throw ( cms::CMSException ) = 0;
+ virtual void writeByte( unsigned char value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a byte array from the Stream message stream.
@@ -136,7 +144,10 @@
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
virtual std::size_t readBytes( std::vector<unsigned char>& value ) const
- throw ( cms::CMSException ) = 0;
+ throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a byte array to the Stream message stream using the vector
@@ -149,7 +160,8 @@
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
virtual void writeBytes( const std::vector<unsigned char>& value )
- throw ( cms::CMSException ) = 0;
+ throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a portion of the Stream message stream.
@@ -182,8 +194,11 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual std::size_t readBytes( unsigned char*& buffer, std::size_t length ) const
- throw ( cms::CMSException ) = 0;
+ virtual std::size_t readBytes( unsigned char* buffer, std::size_t length ) const
+ throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a portion of a byte array to the Stream message stream.
@@ -199,9 +214,9 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeBytes( const unsigned char* value,
- std::size_t offset,
- std::size_t length ) throw ( cms::CMSException ) = 0;
+ virtual void writeBytes( const unsigned char* value, std::size_t offset, std::size_t length )
+ throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a Char from the Stream message stream
@@ -213,7 +228,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual char readChar() const throw ( cms::CMSException ) = 0;
+ virtual char readChar() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a char to the Stream message stream as a 1-byte value
@@ -224,7 +242,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeChar( char value ) throw ( cms::CMSException ) = 0;
+ virtual void writeChar( char value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a 32 bit float from the Stream message stream
@@ -236,7 +255,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual float readFloat() const throw ( cms::CMSException ) = 0;
+ virtual float readFloat() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a float to the Stream message stream as a 4 byte value
@@ -246,7 +268,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeFloat( float value ) throw ( cms::CMSException ) = 0;
+ virtual void writeFloat( float value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a 64 bit double from the Stream message stream
@@ -258,7 +281,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual double readDouble() const throw ( cms::CMSException ) = 0;
+ virtual double readDouble() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a double to the Stream message stream as a 8 byte value
@@ -268,7 +294,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeDouble( double value ) throw ( cms::CMSException ) = 0;
+ virtual void writeDouble( double value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a 16 bit signed short from the Stream message stream
@@ -280,7 +307,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual short readShort() const throw ( cms::CMSException ) = 0;
+ virtual short readShort() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a signed short to the Stream message stream as a 2 byte value
@@ -291,7 +321,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeShort( short value ) throw ( cms::CMSException ) = 0;
+ virtual void writeShort( short value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a 16 bit unsigned short from the Stream message stream
@@ -303,7 +334,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual unsigned short readUnsignedShort() const throw ( cms::CMSException ) = 0;
+ virtual unsigned short readUnsignedShort() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a unsigned short to the Stream message stream as a 2 byte value
@@ -314,8 +348,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeUnsignedShort( unsigned short value )
- throw ( cms::CMSException ) = 0;
+ virtual void writeUnsignedShort( unsigned short value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a 32 bit signed integer from the Stream message stream
@@ -327,7 +361,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual int readInt() const throw ( cms::CMSException ) = 0;
+ virtual int readInt() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a signed int to the Stream message stream as a 4 byte value
@@ -338,7 +375,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeInt( int value ) throw ( cms::CMSException ) = 0;
+ virtual void writeInt( int value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads a 64 bit long from the Stream message stream
@@ -350,7 +388,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual long long readLong() const throw ( cms::CMSException ) = 0;
+ virtual long long readLong() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes a long long to the Stream message stream as a 8 byte value
@@ -361,7 +402,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeLong( long long value ) throw ( cms::CMSException ) = 0;
+ virtual void writeLong( long long value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

/**
* Reads an ASCII String from the Stream message stream
@@ -373,7 +415,10 @@
* @throw MessageFormatException - if this type conversion is invalid.
* @throw MessageNotReadableException - if the message is in write-only mode.
*/
- virtual std::string readString() const throw ( cms::CMSException ) = 0;
+ virtual std::string readString() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) = 0;

/**
* Writes an ASCII String to the Stream message stream
@@ -384,8 +429,8 @@
* to some internal error.
* @throws MessageNotWriteableException - if the message is in read-only mode.
*/
- virtual void writeString( const std::string& value )
- throw ( cms::CMSException ) = 0;
+ virtual void writeString( const std::string& value )throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) = 0;

};

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp Wed Nov 11 16:01:47 2009
@@ -44,7 +44,7 @@
}

////////////////////////////////////////////////////////////////////////////////
-unsigned char StandardInputStream::read() throw ( decaf::io::IOException ) {
+int StandardInputStream::read() throw ( decaf::io::IOException ) {

if( !std::cin.good() ) {
throw decaf::io::IOException(

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.h Wed Nov 11 16:01:47 2009
@@ -50,7 +50,7 @@
* @return The next byte.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( decaf::io::IOException );
+ virtual int read() throw ( decaf::io::IOException );

/**
* Reads an array of bytes from the buffer.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.cpp Wed Nov 11 16:01:47 2009
@@ -81,7 +81,7 @@
}

////////////////////////////////////////////////////////////////////////////////
-unsigned char BlockingByteArrayInputStream::read() throw ( IOException ){
+int BlockingByteArrayInputStream::read() throw ( IOException ){

try{
synchronized( this ){

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.h Wed Nov 11 16:01:47 2009
@@ -101,7 +101,7 @@
* @return the next byte.
* @throws IOException if an error occurs.
*/
- virtual unsigned char read() throw ( IOException );
+ virtual int read() throw ( IOException );

/**
* Reads an array of bytes from the buffer. If the desired amount

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp Wed Nov 11 16:01:47 2009
@@ -95,7 +95,7 @@
}

////////////////////////////////////////////////////////////////////////////////
-unsigned char BufferedInputStream::read() throw ( IOException ){
+int BufferedInputStream::read() throw ( IOException ){

try{

@@ -114,10 +114,8 @@
if( isEmpty() ){

// If we hit EOF without getting any Data, then throw IOException
- if( bufferData() == -1 ){
- throw IOException(
- __FILE__, __LINE__,
- "BufferedInputStream::read - EOF has been Reached");
+ if( bufferData() == -1 ) {
+ return -1;
}
}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.h Wed Nov 11 16:01:47 2009
@@ -115,7 +115,7 @@
* @return The next byte.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( IOException );
+ virtual int read() throw ( IOException );

/**
* Reads an array of bytes from the buffer. Blocks

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp Wed Nov 11 16:01:47 2009
@@ -87,7 +87,7 @@
}

////////////////////////////////////////////////////////////////////////////////
-unsigned char ByteArrayInputStream::read() throw ( IOException ){
+int ByteArrayInputStream::read() throw ( IOException ){

if( activeBuffer == NULL ){
throw IOException(
@@ -96,9 +96,7 @@
}

if( pos == activeBuffer->end() ){
- throw IOException(
- __FILE__, __LINE__,
- "ByteArrayInputStream::read - Buffer is empty" );
+ return -1;
}

return *(pos++);

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h Wed Nov 11 16:01:47 2009
@@ -124,7 +124,7 @@
* @return The next byte.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( IOException );
+ virtual int read() throw ( IOException );

/**
* Reads an array of bytes from the buffer.

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.h Wed Nov 11 16:01:47 2009
@@ -72,7 +72,7 @@
* @return pointer to the data
*/
virtual const unsigned char* toByteArray() const {
- if( activeBuffer->size() == 0 ){
+ if( activeBuffer == NULL || activeBuffer->size() == 0 ){
return NULL;
}

@@ -80,6 +80,18 @@
}

/**
+ * Get a snapshot of the data
+ * @return reference to the underlying data as a const std::vector<unsigned char>&
+ */
+ virtual const std::vector<unsigned char> toByteArrayRef() const {
+ if( activeBuffer == NULL ){
+ return defaultBuffer;
+ }
+
+ return *activeBuffer;
+ }
+
+ /**
* Get the Size of the Internal Buffer
* @return size of the internal buffer
*/

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/DataInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/DataInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/DataInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/DataInputStream.h Wed Nov 11 16:01:47 2009
@@ -63,6 +63,10 @@

virtual ~DataInputStream();

+ virtual int read() throw ( IOException ) {
+ return FilterInputStream::read();
+ }
+
/**
* Reads some number of bytes from the contained input stream and
* stores them into the buffer array b. The number of bytes actually

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h Wed Nov 11 16:01:47 2009
@@ -108,7 +108,7 @@
* @return The next byte.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( IOException ) {
+ virtual int read() throw ( IOException ) {
try {

if( isClosed() ) {

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/InputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/InputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/InputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/InputStream.h Wed Nov 11 16:01:47 2009
@@ -91,12 +91,15 @@
virtual std::size_t available() const throw ( IOException ) = 0;

/**
- * Reads a single byte from the buffer. Blocks until
- * data is available.
- * @return The next byte.
+ * Reads a single byte from the buffer. The value byte is returned as an int in the
+ * range 0 to 255. If no byte is available because the end of the stream has been reached,
+ * the value -1 is returned. This method blocks until input data is available, the end of
+ * the stream is detected, or an exception is thrown.
+ *
+ * @return The next byte or -1 if the end of stream is reached.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( IOException ) = 0;
+ virtual int read() throw ( IOException ) = 0;

/**
* Reads an array of bytes from the buffer. Blocks until

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Byte.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Byte.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Byte.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Byte.cpp Wed Nov 11 16:01:47 2009
@@ -35,7 +35,7 @@

////////////////////////////////////////////////////////////////////////////////
std::string Byte::toString() const {
- return string( 1, this->value );
+ return Integer::toString( value );
}

////////////////////////////////////////////////////////////////////////////////

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.cpp Wed Nov 11 16:01:47 2009
@@ -135,7 +135,7 @@
}

////////////////////////////////////////////////////////////////////////////////
-unsigned char SocketInputStream::read() throw ( IOException ){
+int SocketInputStream::read() throw ( IOException ){

// Check for a closed call from socket class, if closed then this read fails.
if( closed ){

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.h Wed Nov 11 16:01:47 2009
@@ -66,7 +66,7 @@
* @return The next byte.
* @throws IOException thrown if an error occurs.
*/
- virtual unsigned char read() throw ( io::IOException );
+ virtual int read() throw ( io::IOException );

/**
* Reads an array of bytes from the buffer. If the desired amount

From forum: ActiveMQ - Commits

svn commit: r834931 [1/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/commands/ main/activemq/core/ main/activemq/io/ main/cms/ main/decaf/internal/io/ main/decaf/io/ main/decaf/lang/ main/decaf/net/ test/ test/activemq/comm...

2009-11-11T08:01:48Z

Author: tabish
Date: Wed Nov 11 16:01:47 2009
New Revision: 834931

URL: http://svn.apache.org/viewvc?rev=834931&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQCPP-265

Proper implementation of the StreamMessage. Update the CMS StreamMessage API to reflect the exceptions that can be thrown from the StreamMessage command. Add new unit tests to validate that the message behaves as expected.

Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQTextMessage.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/Message.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/io/LoggingInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/StreamMessage.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/internal/io/StandardInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BlockingByteArrayInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/BufferedInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/ByteArrayOutputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/DataInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/FilterInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/InputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Byte.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketInputStream.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/Makefile.am Wed Nov 11 16:01:47 2009
@@ -130,6 +130,7 @@
activemq/transport/tcp/TcpTransport.cpp \
activemq/transport/tcp/TcpTransportFactory.cpp \
activemq/util/ActiveMQProperties.cpp \
+ activemq/util/CMSExceptionSupport.cpp \
activemq/util/CompositeData.cpp \
activemq/util/LongSequenceGenerator.cpp \
activemq/util/MemoryUsage.cpp \
@@ -704,6 +705,7 @@
activemq/transport/tcp/TcpTransport.h \
activemq/transport/tcp/TcpTransportFactory.h \
activemq/util/ActiveMQProperties.h \
+ activemq/util/CMSExceptionSupport.h \
activemq/util/CompositeData.h \
activemq/util/Config.h \
activemq/util/LongSequenceGenerator.h \
@@ -1104,6 +1106,7 @@
decaf/internal/util/concurrent/ConditionImpl.h \
decaf/internal/util/concurrent/MutexImpl.h \
decaf/internal/util/concurrent/SynchronizableImpl.h \
+ decaf/internal/util/concurrent/Transferer.h \
decaf/internal/util/concurrent/unix/ConditionHandle.h \
decaf/internal/util/concurrent/unix/MutexHandle.h \
decaf/internal/util/concurrent/windows/ConditionHandle.h \

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.cpp Wed Nov 11 16:01:47 2009
@@ -66,16 +66,6 @@
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQBytesMessage::checkWriteOnlyBody() const throw ( cms::CMSException ){
- if( !this->isReadOnlyBody() ){
- throw exceptions::ActiveMQException(
- __FILE__, __LINE__,
- "message is in write-only mode and "
- "cannot be read from" ).convertToCMSException();
- }
-}
-
-////////////////////////////////////////////////////////////////////////////////
void ActiveMQBytesMessage::setBodyBytes( const unsigned char* buffer,
std::size_t numBytes )
throw( cms::CMSException ) {
@@ -126,7 +116,7 @@
bool ActiveMQBytesMessage::readBoolean() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readBoolean();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -136,7 +126,7 @@
void ActiveMQBytesMessage::writeBoolean( bool value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeBoolean( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -146,7 +136,7 @@
unsigned char ActiveMQBytesMessage::readByte() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readByte();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -156,7 +146,7 @@
void ActiveMQBytesMessage::writeByte( unsigned char value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeByte( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -167,7 +157,7 @@
throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.read( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -177,7 +167,7 @@
void ActiveMQBytesMessage::writeBytes( const std::vector<unsigned char>& value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.write( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -188,7 +178,7 @@
throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.read( buffer, 0, length );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -200,7 +190,7 @@
std::size_t length ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.write( value, offset, length );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -210,7 +200,7 @@
char ActiveMQBytesMessage::readChar() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readChar();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -220,7 +210,7 @@
void ActiveMQBytesMessage::writeChar( char value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeChar( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -230,7 +220,7 @@
float ActiveMQBytesMessage::readFloat() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readFloat();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -240,7 +230,7 @@
void ActiveMQBytesMessage::writeFloat( float value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeFloat( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -250,7 +240,7 @@
double ActiveMQBytesMessage::readDouble() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readDouble();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -260,7 +250,7 @@
void ActiveMQBytesMessage::writeDouble( double value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeDouble( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -270,7 +260,7 @@
short ActiveMQBytesMessage::readShort() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readShort();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -280,7 +270,7 @@
void ActiveMQBytesMessage::writeShort( short value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeShort( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -290,7 +280,7 @@
unsigned short ActiveMQBytesMessage::readUnsignedShort() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readUnsignedShort();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -300,7 +290,7 @@
void ActiveMQBytesMessage::writeUnsignedShort( unsigned short value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeUnsignedShort( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -310,7 +300,7 @@
int ActiveMQBytesMessage::readInt() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readInt();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -320,7 +310,7 @@
void ActiveMQBytesMessage::writeInt( int value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeInt( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -330,7 +320,7 @@
long long ActiveMQBytesMessage::readLong() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readLong();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -340,7 +330,7 @@
void ActiveMQBytesMessage::writeLong( long long value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeLong( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -350,7 +340,7 @@
std::string ActiveMQBytesMessage::readString() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readString();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -360,7 +350,7 @@
void ActiveMQBytesMessage::writeString( const std::string& value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeChars( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -370,7 +360,7 @@
std::string ActiveMQBytesMessage::readUTF() const throw ( cms::CMSException ) {

try{
- checkWriteOnlyBody();
+ failIfWriteOnlyBody();
return dataInputStream.readUTF();
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -380,7 +370,7 @@
void ActiveMQBytesMessage::writeUTF( const std::string& value ) throw ( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
dataOutputStream.writeUTF( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQBytesMessage.h Wed Nov 11 16:01:47 2009
@@ -393,14 +393,6 @@
*/
virtual void writeUTF( const std::string& value ) throw ( cms::CMSException );

- protected:
-
- /**
- * Throws an exception if in write-only mode.
- * @throws CMSException.
- */
- void checkWriteOnlyBody() const throw ( cms::CMSException );
-
};

}}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMapMessage.cpp Wed Nov 11 16:01:47 2009
@@ -186,7 +186,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setBool( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -208,7 +208,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setByte( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -230,7 +230,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setByteArray( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -251,7 +251,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setChar( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -273,7 +273,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setDouble( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -294,7 +294,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setFloat( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -315,7 +315,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setInt( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -336,7 +336,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setLong( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -357,7 +357,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setShort( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -379,7 +379,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyBody();
+ failIfReadOnlyBody();
getMap().setString( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQMessageTemplate.h Wed Nov 11 16:01:47 2009
@@ -25,6 +25,9 @@
#include <activemq/wireformat/openwire/utils/MessagePropertyInterceptor.h>
#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshaller.h>

+#include <cms/MessageNotReadableException.h>
+#include <cms/MessageNotWriteableException.h>
+
namespace activemq {
namespace commands {

@@ -224,7 +227,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setBooleanProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -241,7 +244,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setByteProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -258,7 +261,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setDoubleProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -275,7 +278,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setFloatProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -292,7 +295,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setIntProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -309,7 +312,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setLongProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -326,7 +329,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setShortProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -343,7 +346,7 @@
throw( cms::CMSException ) {

try{
- checkReadOnlyProperties();
+ failIfReadOnlyProperties();
this->propertiesInterceptor->setStringProperty( name, value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
@@ -548,17 +551,29 @@

protected:

- void checkReadOnlyBody() {
+ virtual void onSend() {
+ this->setReadOnlyBody(true);
+ this->setReadOnlyProperties(true);
+ }
+
+ void failIfWriteOnlyBody() const {
+ if( !this->isReadOnlyBody() ){
+ throw cms::MessageNotReadableException(
+ "message is in write-only mode and cannot be read from", NULL );
+ }
+ }
+
+ void failIfReadOnlyBody() const {
if( this->isReadOnlyBody() ) {
- throw exceptions::ActiveMQException(
- __FILE__, __LINE__, "Message Body is Read-Only." );
+ throw cms::MessageNotWriteableException(
+ "Message Body is Read-Only.", NULL );
}
}

- void checkReadOnlyProperties() {
+ void failIfReadOnlyProperties() const {
if( this->isReadOnlyProperties() ) {
- throw exceptions::ActiveMQException(
- __FILE__, __LINE__, "Message Properties are Read-Only." );
+ throw cms::MessageNotWriteableException(
+ "Message Properties are Read-Only.", NULL );
}
}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/commands/ActiveMQStreamMessage.cpp Wed Nov 11 16:01:47 2009
@@ -15,20 +15,38 @@
* limitations under the License.
*/
#include <activemq/commands/ActiveMQStreamMessage.h>
-#include <activemq/wireformat/openwire/marshal/PrimitiveTypesMarshaller.h>
+#include <activemq/wireformat/openwire/utils/OpenwireStringSupport.h>
+#include <activemq/util/PrimitiveValueNode.h>
+#include <activemq/util/CMSExceptionSupport.h>
+
+#include <cms/MessageEOFException.h>
+#include <cms/MessageFormatException.h>
+#include <cms/MessageNotReadableException.h>
+#include <cms/MessageNotWriteableException.h>

#include <algorithm>

#include <decaf/lang/Math.h>
+#include <decaf/lang/exceptions/NullPointerException.h>
+#include <decaf/lang/Character.h>
+#include <decaf/lang/Boolean.h>
+#include <decaf/lang/Byte.h>
+#include <decaf/lang/Short.h>
+#include <decaf/lang/Integer.h>
+#include <decaf/lang/Long.h>
+#include <decaf/lang/Double.h>
+#include <decaf/lang/Float.h>
+#include <decaf/io/ByteArrayInputStream.h>

using namespace std;
+using namespace cms;
using namespace activemq;
using namespace activemq::util;
using namespace activemq::commands;
using namespace activemq::exceptions;
using namespace activemq::wireformat;
using namespace activemq::wireformat::openwire;
-using namespace activemq::wireformat::openwire::marshal;
+using namespace activemq::wireformat::openwire::utils;
using namespace decaf;
using namespace decaf::io;
using namespace decaf::lang;
@@ -36,13 +54,14 @@

////////////////////////////////////////////////////////////////////////////////
ActiveMQStreamMessage::ActiveMQStreamMessage() :
- ActiveMQMessageTemplate< cms::StreamMessage >(), currentPos( 0 ) {
+ ActiveMQMessageTemplate< cms::StreamMessage >() {

this->clearBody();
}

////////////////////////////////////////////////////////////////////////////////
ActiveMQStreamMessage::~ActiveMQStreamMessage() {
+ this->reset();
}

////////////////////////////////////////////////////////////////////////////////
@@ -59,14 +78,24 @@

////////////////////////////////////////////////////////////////////////////////
void ActiveMQStreamMessage::copyDataStructure( const DataStructure* src ) {
- ActiveMQMessageTemplate<cms::StreamMessage>::copyDataStructure( src );

- const ActiveMQStreamMessage* srcStream =
- dynamic_cast< const ActiveMQStreamMessage* >( src );
+ // Protect against invalid self assignment.
+ if( this == src ) {
+ return;
+ }
+
+ const ActiveMQStreamMessage* srcPtr = dynamic_cast<const ActiveMQStreamMessage*>( src );

- if( srcStream != NULL && srcStream->list.get() != NULL ) {
- this->list.reset( new util::PrimitiveList( *srcStream->list ) );
+ if( srcPtr == NULL || src == NULL ) {
+ throw decaf::lang::exceptions::NullPointerException(
+ __FILE__, __LINE__,
+ "ActiveMQStreamMessage::copyDataStructure - src is NULL or invalid" );
}
+
+ ActiveMQStreamMessage* nonConstSrc = const_cast<ActiveMQStreamMessage*>( srcPtr );
+ nonConstSrc->storeContent();
+
+ ActiveMQMessageTemplate<cms::StreamMessage>::copyDataStructure( src );
}

////////////////////////////////////////////////////////////////////////////////
@@ -86,364 +115,817 @@
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::checkWriteOnlyBody() const throw ( cms::CMSException ){
- if( !this->isReadOnlyBody() ){
- throw exceptions::ActiveMQException(
- __FILE__, __LINE__,
- "message is in write-only mode and "
- "cannot be read from" ).convertToCMSException();
- }
+void ActiveMQStreamMessage::clearBody() throw( cms::CMSException ) {
+
+ // Invoke base class's version.
+ ActiveMQMessageTemplate<cms::StreamMessage>::clearBody();
+
+ this->dataIn.reset(NULL);
+ this->dataOut.reset(NULL);
+ this->remainingBytes = -1;
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::beforeMarshal( WireFormat* wireFormat )
- throw ( decaf::io::IOException ) {
+void ActiveMQStreamMessage::onSend() {

- try{
+ this->storeContent();
+ ActiveMQMessageTemplate<cms::StreamMessage>::onSend();
+}

- // Let the base class do its thing.
- ActiveMQMessageTemplate<cms::StreamMessage>::beforeMarshal( wireFormat );
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessage::reset() throw ( cms::CMSException ) {

- if( this->list.get() != NULL && !this->list->isEmpty() ) {
- // Marshal as Content.
- PrimitiveTypesMarshaller::marshal( this->list.get(), getContent() );
- } else {
- clearBody();
- }
+ try{
+ storeContent();
+ this->bytesOut.reset(NULL);
+ this->dataIn.reset(NULL);
+ this->dataOut.reset(NULL);
+ this->remainingBytes = -1;
+ this->setReadOnlyBody(true);
}
- AMQ_CATCH_RETHROW( IOException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, IOException )
- AMQ_CATCHALL_THROW( IOException )
+ AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-PrimitiveList& ActiveMQStreamMessage::getList() throw ( NullPointerException ) {
+bool ActiveMQStreamMessage::readBoolean() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

try{

- this->checkListIsUnmarshalled();
- return *( this->list );
+ initializeReading();
+
+ this->dataIn->mark(10);
+
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "Reached the end of the Stream", NULL );
+ }
+ if( type == PrimitiveValueNode::BOOLEAN_TYPE ) {
+ return this->dataIn->readBoolean();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Boolean::valueOf( this->dataIn->readUTF() ).booleanValue();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to boolean." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( "not a boolean type", NULL );
+ }
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_RETHROW( NullPointerException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, NullPointerException )
- AMQ_CATCHALL_THROW( NullPointerException )
}

////////////////////////////////////////////////////////////////////////////////
-const PrimitiveList& ActiveMQStreamMessage::getList() const
- throw ( decaf::lang::exceptions::NullPointerException ) {
+void ActiveMQStreamMessage::writeBoolean( bool value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
-
- this->checkListIsUnmarshalled();
- return *( this->list );
+ this->dataOut->write( PrimitiveValueNode::BOOLEAN_TYPE );
+ this->dataOut->writeBoolean( value );
}
- AMQ_CATCH_RETHROW( NullPointerException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, NullPointerException )
- AMQ_CATCHALL_THROW( NullPointerException )
+ AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::checkListIsUnmarshalled() const
- throw ( decaf::lang::exceptions::NullPointerException ) {
+unsigned char ActiveMQStreamMessage::readByte() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

+ initializeReading();
try {

- if( this->list.get() == NULL ) {
+ this->dataIn->mark(10);
+ int type = this->dataIn->read();

- this->list.reset( new PrimitiveList() );
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::BYTE_TYPE ) {
+ return this->dataIn->readByte();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Byte::valueOf( this->dataIn->readUTF() ).byteValue();
+ }

- if( getContent().size() != 0 ){
- PrimitiveTypesMarshaller::unmarshal( this->list.get(), getContent() );
- }
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to byte." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a byte type", NULL );
+ }

- if( this->list.get() == NULL ) {
- throw NullPointerException(
- __FILE__, __LINE__,
- "ActiveMQStreamMessage::getMap() - All attempts to create a "
- "list have failed." );
- }
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::create(e);
}
+
+ throw CMSExceptionSupport::createMessageFormatException( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_RETHROW( NullPointerException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, NullPointerException )
- AMQ_CATCHALL_THROW( NullPointerException )
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::reset() throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeByte( unsigned char value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- this->setReadOnlyBody( true );
- this->currentPos = 0;
+ this->dataOut->write( PrimitiveValueNode::BYTE_TYPE );
+ this->dataOut->writeByte( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-bool ActiveMQStreamMessage::readBoolean() const throw ( cms::CMSException ) {
+std::size_t ActiveMQStreamMessage::readBytes( std::vector<unsigned char>& value ) const
+ throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkWriteOnlyBody();
- return this->getList().getBool( this->currentPos++ );
- }
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
+ return this->readBytes( &value[0], value.size() );
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeBoolean( bool value ) throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeBytes( const std::vector<unsigned char>& value )
+ throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkReadOnlyBody();
- this->getList().add( value );
+ this->dataOut->write( PrimitiveValueNode::BYTE_ARRAY_TYPE );
+ this->dataOut->writeInt( value.size() );
+ this->dataOut->write( &value[0], 0, value.size() );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-unsigned char ActiveMQStreamMessage::readByte() const throw ( cms::CMSException ) {
+std::size_t ActiveMQStreamMessage::readBytes( unsigned char* buffer, std::size_t length ) const
+ throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkWriteOnlyBody();
- return this->getList().getByte( this->currentPos++ );
+ initializeReading();
+ try {
+
+ if( buffer == NULL ) {
+ throw NullPointerException( __FILE__, __LINE__, "Passed buffer was NULL" );
+ }
+
+ if( this->remainingBytes == -1 ) {
+
+ this->dataIn->mark( length + 1 );
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+
+ if( type != PrimitiveValueNode::BYTE_ARRAY_TYPE ) {
+ throw MessageFormatException( "Not a byte array", NULL );
+ }
+
+ this->remainingBytes = this->dataIn->readInt();
+
+ } else if( this->remainingBytes == 0 ) {
+ remainingBytes = -1;
+ return -1;
+ }
+
+ if( length <= (size_t)this->remainingBytes ) {
+ // small buffer
+ this->remainingBytes -= length;
+ this->dataIn->readFully( buffer, 0, length );
+ return length;
+ } else {
+ // big buffer
+ int rc = this->dataIn->read( buffer, 0, this->remainingBytes );
+ this->remainingBytes = 0;
+ return rc;
+ }
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeByte( unsigned char value ) throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeBytes( const unsigned char* value,
+ std::size_t offset,
+ std::size_t length ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkReadOnlyBody();
- this->getList().add( value );
+ this->dataOut->write( PrimitiveValueNode::BYTE_ARRAY_TYPE );
+ this->dataOut->writeInt( length );
+ this->dataOut->write( value, offset, length );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQStreamMessage::readBytes( std::vector<unsigned char>& value ) const
- throw ( cms::CMSException ) {
+char ActiveMQStreamMessage::readChar() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkWriteOnlyBody();
- value = this->getList().getByteArray( this->currentPos++ );
- return value.size();
+ initializeReading();
+ try {
+
+ this->dataIn->mark( 17 );
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::CHAR_TYPE ) {
+ return this->dataIn->readChar();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to char." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a char type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& ioe ) {
+ throw CMSExceptionSupport::create( ioe );
+ }
+
+ throw CMSExceptionSupport::create( ex );;
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeBytes( const std::vector<unsigned char>& value )
- throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeChar( char value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkReadOnlyBody();
- this->getList().add( value );
+ this->dataOut->write( PrimitiveValueNode::CHAR_TYPE );
+ this->dataOut->writeChar( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-std::size_t ActiveMQStreamMessage::readBytes( unsigned char*& buffer, std::size_t length ) const
- throw ( cms::CMSException ) {
+float ActiveMQStreamMessage::readFloat() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
+ initializeReading();
+ try {

- if( buffer == NULL ) {
- throw cms::CMSException( "Passed Buffer was NULL", NULL );
+ this->dataIn->mark( 33 );
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::FLOAT_TYPE ) {
+ return this->dataIn->readFloat();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Float::valueOf( this->dataIn->readUTF() ).floatValue();
}

- checkWriteOnlyBody();
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to float." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a float type", NULL );
+ }

- std::vector<unsigned char> temp = this->getList().getByteArray( this->currentPos++ );
- std::size_t amount = Math::min( (unsigned int)length, (unsigned int)temp.size() );
+ } catch( NumberFormatException& ex ) {

- for( std::size_t i = 0; i < amount; ++i ) {
- buffer[i] = temp.at( i );
+ try {
+ this->dataIn->reset();
+ } catch( IOException& ioe ) {
+ throw CMSExceptionSupport::create( ioe );
}

- return amount;
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeBytes( const unsigned char* value,
- std::size_t offset,
- std::size_t length ) throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeFloat( float value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
-
- checkReadOnlyBody();
-
- std::vector<unsigned char> temp;
- for( std::size_t i = offset; i < length; ++i ) {
- temp.push_back( value[i] );
- }
-
- this->getList().add( temp );
+ this->dataOut->write( PrimitiveValueNode::FLOAT_TYPE );
+ this->dataOut->writeFloat( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-char ActiveMQStreamMessage::readChar() const throw ( cms::CMSException ) {
+double ActiveMQStreamMessage::readDouble() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkWriteOnlyBody();
- return this->getList().getChar( this->currentPos++ );
+ initializeReading();
+ try {
+
+ this->dataIn->mark( 33 );
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::DOUBLE_TYPE ) {
+ return this->dataIn->readDouble();
+ }
+ if( type == PrimitiveValueNode::FLOAT_TYPE ) {
+ return this->dataIn->readFloat();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Double::valueOf( this->dataIn->readUTF() ).doubleValue();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to double." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a double type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& ioe ) {
+ throw CMSExceptionSupport::create( ioe );
+ }
+
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeChar( char value ) throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeDouble( double value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkReadOnlyBody();
- this->getList().add( value );
+ this->dataOut->write( PrimitiveValueNode::DOUBLE_TYPE );
+ this->dataOut->writeDouble( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-float ActiveMQStreamMessage::readFloat() const throw ( cms::CMSException ) {
+short ActiveMQStreamMessage::readShort() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkWriteOnlyBody();
- return this->getList().getFloat( this->currentPos++ );
- }
- AMQ_CATCH_RETHROW( ActiveMQException )
- AMQ_CATCH_EXCEPTION_CONVERT( Exception, ActiveMQException )
- AMQ_CATCHALL_THROW( ActiveMQException )
-}
+ initializeReading();
+ try {

-////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeFloat( float value ) throw ( cms::CMSException ) {
+ this->dataIn->mark(17);
+ int type = this->dataIn->read();

- try{
- checkReadOnlyBody();
- this->getList().add( value );
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::SHORT_TYPE ) {
+ return this->dataIn->readShort();
+ }
+ if( type == PrimitiveValueNode::BYTE_TYPE ) {
+ return this->dataIn->readByte();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Short::valueOf( this->dataIn->readUTF() ).shortValue();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to short." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a short type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::create(e);
+ }
+
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-double ActiveMQStreamMessage::readDouble() const throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeShort( short value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkWriteOnlyBody();
- return this->getList().getDouble( this->currentPos++ );
+ this->dataOut->write( PrimitiveValueNode::SHORT_TYPE );
+ this->dataOut->writeShort( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeDouble( double value ) throw ( cms::CMSException ) {
+unsigned short ActiveMQStreamMessage::readUnsignedShort() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkReadOnlyBody();
- this->getList().add( value );
+ initializeReading();
+ try {
+
+ this->dataIn->mark(17);
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::SHORT_TYPE ) {
+ return this->dataIn->readUnsignedShort();
+ }
+ if( type == PrimitiveValueNode::BYTE_TYPE ) {
+ return this->dataIn->readByte();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Short::valueOf( this->dataIn->readUTF() ).shortValue();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to short." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a short type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::create(e);
+ }
+
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-short ActiveMQStreamMessage::readShort() const throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeUnsignedShort( unsigned short value )
+ throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkWriteOnlyBody();
- return this->getList().getShort( this->currentPos++ );
+ this->dataOut->write( PrimitiveValueNode::SHORT_TYPE );
+ this->dataOut->writeUnsignedShort( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeShort( short value ) throw ( cms::CMSException ) {
+int ActiveMQStreamMessage::readInt() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkReadOnlyBody();
- this->getList().add( value );
+ initializeReading();
+ try {
+
+ this->dataIn->mark(33);
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::INTEGER_TYPE ) {
+ return this->dataIn->readInt();
+ }
+ if( type == PrimitiveValueNode::SHORT_TYPE ) {
+ return this->dataIn->readShort();
+ }
+ if( type == PrimitiveValueNode::BYTE_TYPE ) {
+ return this->dataIn->readByte();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Integer::valueOf( this->dataIn->readUTF() ).intValue();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to int." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a int type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::create(e);
+ }
+
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-unsigned short ActiveMQStreamMessage::readUnsignedShort() const throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeInt( int value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkWriteOnlyBody();
- return (unsigned short)this->getList().getShort( this->currentPos++ );
+ this->dataOut->write( PrimitiveValueNode::INTEGER_TYPE );
+ this->dataOut->writeInt( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeUnsignedShort( unsigned short value ) throw ( cms::CMSException ) {
+long long ActiveMQStreamMessage::readLong() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkReadOnlyBody();
- this->getList().add( (short)value );
+ initializeReading();
+ try {
+
+ this->dataIn->mark(65);
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::LONG_TYPE ) {
+ return this->dataIn->readLong();
+ }
+ if( type == PrimitiveValueNode::INTEGER_TYPE ) {
+ return this->dataIn->readInt();
+ }
+ if( type == PrimitiveValueNode::SHORT_TYPE ) {
+ return this->dataIn->readShort();
+ }
+ if( type == PrimitiveValueNode::BYTE_TYPE ) {
+ return this->dataIn->readByte();
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return Long::valueOf( this->dataIn->readUTF() ).longValue();
+ }
+
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ this->dataIn->reset();
+ throw NullPointerException( __FILE__, __LINE__, "Cannot convert NULL value to long." );
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a long type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::create(e);
+ }
+
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-int ActiveMQStreamMessage::readInt() const throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeLong( long long value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkWriteOnlyBody();
- return this->getList().getInt( this->currentPos++ );
+ this->dataOut->write( PrimitiveValueNode::LONG_TYPE );
+ this->dataOut->writeLong( value );
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeInt( int value ) throw ( cms::CMSException ) {
+std::string ActiveMQStreamMessage::readString() const throw ( cms::MessageEOFException,
+ cms::MessageFormatException,
+ cms::MessageNotReadableException,
+ cms::CMSException ) {

- try{
- checkReadOnlyBody();
- this->getList().add( value );
+ initializeReading();
+ try {
+
+ this->dataIn->mark( 65 );
+ int type = this->dataIn->read();
+
+ if( type == -1 ) {
+ throw MessageEOFException( "reached end of data", NULL );
+ }
+ if( type == PrimitiveValueNode::NULL_TYPE ) {
+ return "";
+ }
+ if( type == PrimitiveValueNode::BIG_STRING_TYPE ) {
+ return OpenwireStringSupport::readString( *dataIn );
+ }
+ if( type == PrimitiveValueNode::STRING_TYPE ) {
+ return this->dataIn->readUTF();
+ }
+ if( type == PrimitiveValueNode::LONG_TYPE ) {
+ return Long( this->dataIn->readLong() ).toString();
+ }
+ if( type == PrimitiveValueNode::INTEGER_TYPE ) {
+ return Integer( this->dataIn->readInt() ).toString();
+ }
+ if( type == PrimitiveValueNode::SHORT_TYPE ) {
+ return Short( this->dataIn->readShort() ).toString();
+ }
+ if( type == PrimitiveValueNode::BYTE_TYPE ) {
+ return Byte( this->dataIn->readByte() ).toString();
+ }
+ if( type == PrimitiveValueNode::FLOAT_TYPE ) {
+ return Float( this->dataIn->readFloat() ).toString();
+ }
+ if( type == PrimitiveValueNode::DOUBLE_TYPE ) {
+ return Double( this->dataIn->readDouble() ).toString();
+ }
+ if( type == PrimitiveValueNode::BOOLEAN_TYPE ) {
+ return ( this->dataIn->readBoolean() ? Boolean::_TRUE : Boolean::_FALSE ).toString();
+ }
+
+ if( type == PrimitiveValueNode::CHAR_TYPE ) {
+ return Character( this->dataIn->readChar() ).toString();
+ } else {
+ this->dataIn->reset();
+ throw MessageFormatException( " not a String type", NULL );
+ }
+
+ } catch( NumberFormatException& ex ) {
+
+ try {
+ this->dataIn->reset();
+ } catch( IOException& ioe ) {
+ throw CMSExceptionSupport::create( ioe );
+ }
+
+ throw CMSExceptionSupport::create( ex );
+
+ } catch( EOFException& e ) {
+ throw CMSExceptionSupport::createMessageEOFException( e );
+ } catch( IOException& e ) {
+ throw CMSExceptionSupport::createMessageFormatException( e );
+ } catch( Exception& e ) {
+ throw CMSExceptionSupport::create( e );
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-long long ActiveMQStreamMessage::readLong() const throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::writeString( const std::string& value ) throw ( cms::MessageNotWriteableException,
+ cms::CMSException ) {

+ initializeWriting();
try{
- checkWriteOnlyBody();
- return this->getList().getLong( this->currentPos++ );
+ if( value.size() <= Short::MAX_VALUE / 4 ) {
+ this->dataOut->write( PrimitiveValueNode::STRING_TYPE );
+ this->dataOut->writeUTF( value );
+ } else {
+ this->dataOut->write( PrimitiveValueNode::BIG_STRING_TYPE );
+ OpenwireStringSupport::writeString( *(this->dataOut), &value );
+ }
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeLong( long long value ) throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::storeContent() {

- try{
- checkReadOnlyBody();
- this->getList().add( value );
+ if( this->dataOut.get() != NULL ) {
+
+ this->dataOut->close();
+ this->setContent( this->bytesOut->toByteArrayRef() );
+ this->dataOut.reset(NULL);
+ this->bytesOut.reset(NULL);
}
- AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-std::string ActiveMQStreamMessage::readString() const throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::initializeReading() const {

- try{
- checkWriteOnlyBody();
- return this->getList().getString( this->currentPos++ );
+ this->failIfWriteOnlyBody();
+ try {
+ if( this->dataIn.get() == NULL) {
+ ByteArrayInputStream* is = new ByteArrayInputStream( this->getContent() );
+ this->dataIn.reset( new DataInputStream( is, true ) );
+ }
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

////////////////////////////////////////////////////////////////////////////////
-void ActiveMQStreamMessage::writeString( const std::string& value ) throw ( cms::CMSException ) {
+void ActiveMQStreamMessage::initializeWriting() {

+ this->failIfReadOnlyBody();
try{
- checkReadOnlyBody();
- this->getList().add( value );
+ if( this->dataOut.get() == NULL ) {
+ this->bytesOut.reset( new ByteArrayOutputStream() );
+ this->dataOut.reset( new DataOutputStream( this->bytesOut.get() ) );
+ }
}
AMQ_CATCH_ALL_THROW_CMSEXCEPTION()
}

From forum: ActiveMQ - Commits

svn commit: r834931 [3/3] - in /activemq/activemq-cpp/trunk/activemq-cpp/src: main/ main/activemq/commands/ main/activemq/core/ main/activemq/io/ main/cms/ main/decaf/internal/io/ main/decaf/io/ main/decaf/lang/ main/decaf/net/ test/ test/activemq/comm...

2009-11-11T08:01:48Z

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.cpp Wed Nov 11 16:01:47 2009
@@ -19,9 +19,36 @@

#include <activemq/commands/ActiveMQStreamMessage.h>

+#include <cms/MessageFormatException.h>
+#include <cms/MessageEOFException.h>
+#include <cms/MessageNotReadableException.h>
+#include <cms/MessageNotWriteableException.h>
+
+#include <decaf/lang/Boolean.h>
+#include <decaf/lang/Byte.h>
+#include <decaf/lang/Character.h>
+#include <decaf/lang/Short.h>
+#include <decaf/lang/Integer.h>
+#include <decaf/lang/Long.h>
+#include <decaf/lang/Float.h>
+#include <decaf/lang/Double.h>
+
+using namespace cms;
using namespace std;
using namespace activemq;
using namespace activemq::commands;
+using namespace decaf;
+using namespace decaf::lang;
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::setUp() {
+ this->buffer.reserve( 100 );
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::tearDown() {
+ this->buffer.clear();
+}

////////////////////////////////////////////////////////////////////////////////
void ActiveMQStreamMessageTest::testSetAndGet() {
@@ -61,3 +88,874 @@
CPPUNIT_ASSERT( myMessage.readBytes( readData ) == data.size() );
}

+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadBoolean() {
+
+ ActiveMQStreamMessage msg;
+
+ try {
+
+ msg.writeBoolean( true );
+ msg.reset();
+ CPPUNIT_ASSERT( msg.readBoolean() );
+ msg.reset();
+ CPPUNIT_ASSERT( msg.readString() == "true" );
+ msg.reset();
+
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readLong();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadByte() {
+
+ ActiveMQStreamMessage msg;
+ try {
+ unsigned char test = (unsigned char)4;
+ msg.writeByte( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readByte() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readShort() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readInt() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readLong() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Byte(test).toString());
+ msg.reset();
+
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadShort() {
+ ActiveMQStreamMessage msg;
+ try {
+
+ short test = (short)4;
+ msg.writeShort( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readShort() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readInt() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readLong() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Short(test).toString());
+ msg.reset();
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadChar() {
+ ActiveMQStreamMessage msg;
+ try {
+ char test = 'z';
+ msg.writeChar( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readChar() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Character(test).toString());
+ msg.reset();
+
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readLong();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadInt() {
+
+ ActiveMQStreamMessage msg;
+
+ try {
+ int test = 4;
+ msg.writeInt( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readInt() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readLong() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Integer(test).toString());
+ msg.reset();
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadLong() {
+
+ ActiveMQStreamMessage msg;
+
+ try {
+ long test = 4L;
+ msg.writeLong( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readLong() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Long::valueOf(test).toString());
+ msg.reset();
+
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadFloat() {
+ ActiveMQStreamMessage msg;
+ try {
+ float test = 4.4f;
+ msg.writeFloat( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readFloat() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readDouble() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Float(test).toString());
+ msg.reset();
+
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readLong();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadDouble() {
+ ActiveMQStreamMessage msg;
+ try {
+ double test = 4.4;
+ msg.writeDouble( test );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readDouble() == test);
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readString() == Double(test).toString());
+ msg.reset();
+
+ try {
+ msg.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readLong();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadString() {
+ ActiveMQStreamMessage msg;
+ try {
+ unsigned char testByte = (unsigned char)2;
+ msg.writeString( Byte( testByte ).toString() );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readByte() == testByte);
+ msg.clearBody();
+ short testShort = 3;
+ msg.writeString( Short( testShort ).toString() );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readShort() == testShort);
+ msg.clearBody();
+ int testInt = 4;
+ msg.writeString( Integer( testInt ).toString() );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readInt() == testInt);
+ msg.clearBody();
+ long testLong = 6L;
+ msg.writeString( Long( testLong ).toString() );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readLong() == testLong);
+ msg.clearBody();
+ float testFloat = 6.6f;
+ msg.writeString( Float( testFloat ).toString() );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readFloat() == testFloat);
+ msg.clearBody();
+ double testDouble = 7.7;
+ msg.writeString( Double( testDouble ).toString() );
+ msg.reset();
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( testDouble, msg.readDouble(), 0.05 );
+ msg.clearBody();
+ msg.writeString( "true" );
+ msg.reset();
+ CPPUNIT_ASSERT(msg.readBoolean());
+ msg.clearBody();
+ msg.writeString( "a" );
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& e ) {
+ }
+ msg.clearBody();
+ msg.writeString( "777" );
+ msg.reset();
+ try {
+ msg.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& e ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadBigString() {
+ ActiveMQStreamMessage msg;
+ try {
+ // Test with a 1Meg String
+ std::string bigString;
+ bigString.reserve( 1024 * 1024 );
+ for( int i = 0; i < 1024 * 1024; i++ ) {
+ bigString.append( 1, (char)'a' + i % 26 );
+ }
+
+ msg.writeString( bigString );
+ msg.reset();
+ CPPUNIT_ASSERT_EQUAL( bigString, msg.readString() );
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadBytes() {
+
+ ActiveMQStreamMessage msg;
+ try {
+
+ unsigned char test[50];
+ for( int i = 0; i < 50; i++ ) {
+ test[i] = (unsigned char)i;
+ }
+ msg.writeBytes( test, 0, 50 );
+ msg.reset();
+
+ unsigned char valid[50];
+ msg.readBytes( valid, 50 );
+ for( int i = 0; i < 50; i++ ) {
+ CPPUNIT_ASSERT(valid[i] == test[i]);
+ }
+
+ msg.reset();
+ try {
+ msg.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readLong();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+ msg.reset();
+ try {
+ msg.readString();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageFormatException& ex ) {
+ }
+
+ } catch( CMSException& ex ) {
+ ex.printStackTrace();
+ CPPUNIT_ASSERT(false);
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testClearBody() {
+
+ ActiveMQStreamMessage streamMessage;
+ try {
+
+ streamMessage.writeLong( 2LL );
+ streamMessage.clearBody();
+ CPPUNIT_ASSERT( !streamMessage.isReadOnlyBody() );
+ streamMessage.writeLong( 2LL );
+ streamMessage.readLong();
+ CPPUNIT_FAIL("should throw exception");
+
+ } catch( MessageNotReadableException& mnwe ) {
+ } catch( MessageNotWriteableException& mnwe ) {
+ CPPUNIT_FAIL("should be writeable");
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReset() {
+
+ ActiveMQStreamMessage streamMessage;
+
+ try {
+ streamMessage.writeDouble( 24.5 );
+ streamMessage.writeLong( 311LL );
+ } catch( MessageNotWriteableException& mnwe ) {
+ CPPUNIT_FAIL("should be writeable");
+ }
+
+ streamMessage.reset();
+
+ try {
+ CPPUNIT_ASSERT(streamMessage.isReadOnlyBody());
+ CPPUNIT_ASSERT_DOUBLES_EQUAL( streamMessage.readDouble(), 24.5, 0.01 );
+ CPPUNIT_ASSERT_EQUAL( streamMessage.readLong(), 311LL );
+ } catch( MessageNotReadableException& mnre ) {
+ CPPUNIT_FAIL("should be readable");
+ }
+
+ try {
+ streamMessage.writeInt( 33 );
+ CPPUNIT_FAIL("should throw exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testReadOnlyBody() {
+ ActiveMQStreamMessage message;
+ try {
+ message.writeBoolean( true );
+ message.writeByte( (unsigned char)1 );
+ message.writeChar('a');
+ message.writeDouble( 121.5 );
+ message.writeFloat( (float)1.5 );
+ message.writeInt( 1 );
+ message.writeLong( 1 );
+ message.writeShort( (short)1 );
+ message.writeString( "string" );
+ } catch( MessageNotWriteableException& mnwe ) {
+ CPPUNIT_FAIL("Should be writeable");
+ }
+ message.reset();
+ try {
+ message.readBoolean();
+ message.readByte();
+ message.readChar();
+ message.readDouble();
+ message.readFloat();
+ message.readInt();
+ message.readLong();
+ message.readShort();
+ message.readString();
+ } catch( MessageNotReadableException& mnwe ) {
+ CPPUNIT_FAIL("Should be readable");
+ }
+ try {
+ message.writeBoolean( true );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeByte( (unsigned char)1 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ unsigned char test[3];
+ message.writeBytes( test, 0, 2 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeChar( 'a' );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeDouble( 1.5 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeFloat( (float)1.5 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeInt( 1 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeLong( 1 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeShort( (short)1 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+ try {
+ message.writeString( "string" );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotWriteableException& mnwe ) {
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////////
+void ActiveMQStreamMessageTest::testWriteOnlyBody() {
+ ActiveMQStreamMessage message;
+ message.clearBody();
+ try {
+ message.writeBoolean( true );
+ message.writeByte( (unsigned char)1 );
+ message.writeBytes( buffer );
+ message.writeChar( 'a' );
+ message.writeDouble( 1.5 );
+ message.writeFloat( (float)1.5 );
+ message.writeInt( 1 );
+ message.writeLong( 1 );
+ message.writeShort( (short)1 );
+ message.writeString( "string" );
+ } catch( MessageNotWriteableException& mnwe ) {
+ CPPUNIT_FAIL("Should be writeable");
+ }
+ try {
+ message.readBoolean();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& mnwe ) {
+ }
+ try {
+ message.readByte();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readBytes( buffer );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ unsigned char test[50];
+ message.readBytes( test, 50 );
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readChar();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readDouble();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readFloat();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readInt();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readLong();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readString();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readShort();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+ try {
+ message.readString();
+ CPPUNIT_FAIL("Should have thrown exception");
+ } catch( MessageNotReadableException& e ) {
+ }
+}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/commands/ActiveMQStreamMessageTest.h Wed Nov 11 16:01:47 2009
@@ -28,14 +28,51 @@

CPPUNIT_TEST_SUITE( ActiveMQStreamMessageTest );
CPPUNIT_TEST( testSetAndGet );
+ CPPUNIT_TEST( testReadBoolean );
+ CPPUNIT_TEST( testReadByte );
+ CPPUNIT_TEST( testReadShort );
+ CPPUNIT_TEST( testReadChar );
+ CPPUNIT_TEST( testReadInt );
+ CPPUNIT_TEST( testReadLong );
+ CPPUNIT_TEST( testReadFloat );
+ CPPUNIT_TEST( testReadDouble );
+ CPPUNIT_TEST( testReadString );
+ CPPUNIT_TEST( testReadBigString );
+ CPPUNIT_TEST( testReadBytes );
+ CPPUNIT_TEST( testClearBody );
+ CPPUNIT_TEST( testReset );
+ CPPUNIT_TEST( testReadOnlyBody );
+ CPPUNIT_TEST( testWriteOnlyBody );
CPPUNIT_TEST_SUITE_END();

+ private:
+
+ std::vector<unsigned char> buffer;
+
public:

ActiveMQStreamMessageTest() {}
virtual ~ActiveMQStreamMessageTest() {}

+ void setUp();
+ void tearDown();
+
void testSetAndGet();
+ void testReadBoolean();
+ void testReadByte();
+ void testReadShort();
+ void testReadChar();
+ void testReadInt();
+ void testReadLong();
+ void testReadFloat();
+ void testReadDouble();
+ void testReadString();
+ void testReadBigString();
+ void testReadBytes();
+ void testClearBody();
+ void testReset();
+ void testReadOnlyBody();
+ void testWriteOnlyBody();

};

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/BufferedInputStreamTest.cpp Wed Nov 11 16:01:47 2009
@@ -75,7 +75,7 @@
return len - pos;
}

- virtual unsigned char read() throw (IOException){
+ virtual int read() throw (IOException){
if( this->isThrowOnRead() ) {
throw IOException(
__FILE__, __LINE__,
@@ -83,7 +83,7 @@
}

if( pos >= data.length() ){
- throw IOException();
+ return -1;
}

return data.c_str()[pos++];
@@ -191,23 +191,16 @@
BufferedInputStream is( &myStream, testStr.length() );

// Ensure buffer gets filled by evaluating one read
- is.read();
+ CPPUNIT_ASSERT( is.read() != -1 );

// Read the remaining buffered characters, no IOException should
// occur.
is.skip( testStr.length() - 2 );
- is.read();
- try {
- // is.read should now throw an exception because it will have to
- // be filled.
- is.read();
- } catch (IOException& e) {
- exceptionFired = true;
- }
-
- CPPUNIT_ASSERT_MESSAGE( "Exception should have been triggered by read()", exceptionFired );
+ CPPUNIT_ASSERT( is.read() != -1 );
+ // is.read should now return -1 as all data has been read.
+ CPPUNIT_ASSERT( is.read() == -1 );

- } catch (IOException& e) {
+ } catch( IOException& e ) {
e.printStackTrace();
CPPUNIT_ASSERT_MESSAGE("Exception during test_1_Constructor", false );
}
@@ -248,7 +241,7 @@
try {
bis.available();
CPPUNIT_ASSERT_MESSAGE("Expected test to throw IOE.", false );
- } catch (IOException& ex) {
+ } catch( IOException& ex ) {
// expected
}
}
@@ -337,7 +330,7 @@
"Failed to read correct data",
string( (const char*)&buf1[0], 100 ) == testStr.substr( 3000, 100 ) );

- } catch (IOException& e) {
+ } catch( IOException& e ) {
CPPUNIT_FAIL("Exception during read test");
}
}

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/decaf/io/FilterInputStreamTest.cpp Wed Nov 11 16:01:47 2009
@@ -66,7 +66,7 @@
return len - pos;
}

- virtual unsigned char read() throw (IOException){
+ virtual int read() throw (IOException){
if( this->isThrowOnRead() ) {
throw IOException(
__FILE__, __LINE__,
@@ -74,7 +74,7 @@
}

if( pos >= data.length() ){
- throw IOException();
+ return -1;
}

return data.c_str()[pos++];

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp?rev=834931&r1=834930&r2=834931&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test/testRegistry.cpp Wed Nov 11 16:01:47 2009
@@ -18,250 +18,250 @@
// All CPP Unit tests are registered in here so we can disable them and
// enable them easily in one place.

-//#include <activemq/commands/BrokerInfoTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerInfoTest );
-//#include <activemq/commands/BrokerIdTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerIdTest );
-//#include <activemq/commands/ActiveMQTopicTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTopicTest );
-//#include <activemq/commands/ActiveMQTextMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTextMessageTest );
-//#include <activemq/commands/ActiveMQTempTopicTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempTopicTest );
-//#include <activemq/commands/ActiveMQTempQueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempQueueTest );
-//#include <activemq/commands/ActiveMQQueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQQueueTest );
-//#include <activemq/commands/ActiveMQMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMessageTest );
-//#include <activemq/commands/ActiveMQMapMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMapMessageTest );
-//#include <activemq/commands/ActiveMQDestinationTest2.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQDestinationTest );
-//#include <activemq/commands/ActiveMQBytesMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQBytesMessageTest );
-//#include <activemq/commands/ActiveMQStreamMessageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQStreamMessageTest );
-//
-//#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::BaseDataStreamMarshallerTest );
-//#include <activemq/wireformat/openwire/marshal/PrimitiveTypesMarshallerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::PrimitiveTypesMarshallerTest );
-//
-//#include <activemq/wireformat/openwire/utils/BooleanStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::BooleanStreamTest );
-//#include <activemq/wireformat/openwire/utils/HexTableTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::HexTableTest );
-//#include <activemq/wireformat/openwire/utils/OpenwireStringSupportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::OpenwireStringSupportTest );
-//#include <activemq/wireformat/openwire/utils/MessagePropertyInterceptorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::MessagePropertyInterceptorTest );
-//
-//#include <activemq/wireformat/openwire/OpenWireFormatTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::OpenWireFormatTest );
-//
-//#include <activemq/cmsutil/CmsAccessorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsAccessorTest );
-//#include <activemq/cmsutil/CmsDestinationAccessorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsDestinationAccessorTest );
-//#include <activemq/cmsutil/CmsTemplateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsTemplateTest );
-//#include <activemq/cmsutil/DynamicDestinationResolverTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::DynamicDestinationResolverTest );
-//#include <activemq/cmsutil/SessionPoolTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::SessionPoolTest );
-//
-//#include <activemq/core/ActiveMQConnectionFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionFactoryTest );
-//#include <activemq/core/ActiveMQConnectionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionTest );
-//#include <activemq/core/ActiveMQSessionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQSessionTest );
-//#include <activemq/core/MessageDispatchChannelTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::MessageDispatchChannelTest );
-//
-//#include <activemq/state/ConnectionStateTrackerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTrackerTest );
-//#include <activemq/state/ConnectionStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTest );
-//#include <activemq/state/ConsumerStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConsumerStateTest );
-//#include <activemq/state/ProducerStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ProducerStateTest );
-//#include <activemq/state/SessionStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::SessionStateTest );
-//#include <activemq/state/TransactionStateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::TransactionStateTest );
-//
-//#include <activemq/transport/failover/FailoverTransportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::failover::FailoverTransportTest );
-//
-//#include <activemq/transport/correlator/ResponseCorrelatorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::correlator::ResponseCorrelatorTest );
-//
-//#include <activemq/transport/mock/MockTransportFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::mock::MockTransportFactoryTest );
-//
-//#include <activemq/transport/TransportRegistryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::TransportRegistryTest );
-//#include <activemq/transport/IOTransportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::IOTransportTest );
-//
-//#include <activemq/exceptions/ActiveMQExceptionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::exceptions::ActiveMQExceptionTest );
-//
-//#include <activemq/util/LongSequenceGeneratorTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::LongSequenceGeneratorTest );
-//#include <activemq/util/PrimitiveValueNodeTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueNodeTest );
-//#include <activemq/util/PrimitiveListTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveListTest );
-//#include <activemq/util/PrimitiveMapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveMapTest );
-//#include <activemq/util/PrimitiveValueConverterTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueConverterTest );
-//#include <activemq/util/URISupportTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::URISupportTest );
-//#include <activemq/util/MemoryUsageTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::MemoryUsageTest );
-//
-//#include <activemq/threads/DedicatedTaskRunnerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::DedicatedTaskRunnerTest );
-//#include <activemq/threads/CompositeTaskRunnerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::CompositeTaskRunnerTest );
-//
-//#include <activemq/wireformat/WireFormatRegistryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::WireFormatRegistryTest );
-//
-//#include <decaf/internal/util/ByteArrayAdapterTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::ByteArrayAdapterTest );
-//#include <decaf/internal/util/TimerTaskHeapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::TimerTaskHeapTest );
-//
-//#include <decaf/internal/nio/ByteArrayPerspectiveTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayPerspectiveTest );
-//#include <decaf/internal/nio/ByteArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayBufferTest );
-//#include <decaf/internal/nio/BufferFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::BufferFactoryTest );
-//#include <decaf/internal/nio/CharArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::CharArrayBufferTest );
-//#include <decaf/internal/nio/DoubleArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::DoubleArrayBufferTest );
-//#include <decaf/internal/nio/FloatArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::FloatArrayBufferTest );
-//#include <decaf/internal/nio/LongArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::LongArrayBufferTest );
-//#include <decaf/internal/nio/IntArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::IntArrayBufferTest );
-//#include <decaf/internal/nio/ShortArrayBufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ShortArrayBufferTest );
-//
-//#include <decaf/internal/net/URIEncoderDecoderTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIEncoderDecoderTest );
-//#include <decaf/internal/net/URIHelperTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIHelperTest );
-//
-//#include <decaf/nio/BufferTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::nio::BufferTest );
-//
-//#include <decaf/io/FilterInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterInputStreamTest );
-//#include <decaf/io/FilterOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterOutputStreamTest );
-//#include <decaf/io/BufferedInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedInputStreamTest );
-//#include <decaf/io/BufferedOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedOutputStreamTest );
-//#include <decaf/io/ByteArrayInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayInputStreamTest );
-//#include <decaf/io/ByteArrayOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayOutputStreamTest );
-//#include <decaf/io/DataInputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataInputStreamTest );
-//#include <decaf/io/DataOutputStreamTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataOutputStreamTest );
-//
-//#include <decaf/lang/MathTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::MathTest );
-//#include <decaf/lang/ByteTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ByteTest );
-//#include <decaf/lang/CharacterTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::CharacterTest );
-//#include <decaf/lang/BooleanTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::BooleanTest );
-//#include <decaf/lang/ShortTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ShortTest );
-//#include <decaf/lang/IntegerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::IntegerTest );
-//#include <decaf/lang/LongTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::LongTest );
-//#include <decaf/lang/FloatTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::FloatTest );
-//#include <decaf/lang/DoubleTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::DoubleTest );
-//#include <decaf/lang/ExceptionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ExceptionTest );
+#include <activemq/commands/BrokerInfoTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerInfoTest );
+#include <activemq/commands/BrokerIdTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::BrokerIdTest );
+#include <activemq/commands/ActiveMQTopicTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTopicTest );
+#include <activemq/commands/ActiveMQTextMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTextMessageTest );
+#include <activemq/commands/ActiveMQTempTopicTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempTopicTest );
+#include <activemq/commands/ActiveMQTempQueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQTempQueueTest );
+#include <activemq/commands/ActiveMQQueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQQueueTest );
+#include <activemq/commands/ActiveMQMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMessageTest );
+#include <activemq/commands/ActiveMQMapMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQMapMessageTest );
+#include <activemq/commands/ActiveMQDestinationTest2.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQDestinationTest );
+#include <activemq/commands/ActiveMQBytesMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQBytesMessageTest );
+#include <activemq/commands/ActiveMQStreamMessageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::commands::ActiveMQStreamMessageTest );
+
+#include <activemq/wireformat/openwire/marshal/BaseDataStreamMarshallerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::BaseDataStreamMarshallerTest );
+#include <activemq/wireformat/openwire/marshal/PrimitiveTypesMarshallerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::marshal::PrimitiveTypesMarshallerTest );
+
+#include <activemq/wireformat/openwire/utils/BooleanStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::BooleanStreamTest );
+#include <activemq/wireformat/openwire/utils/HexTableTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::HexTableTest );
+#include <activemq/wireformat/openwire/utils/OpenwireStringSupportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::OpenwireStringSupportTest );
+#include <activemq/wireformat/openwire/utils/MessagePropertyInterceptorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::utils::MessagePropertyInterceptorTest );
+
+#include <activemq/wireformat/openwire/OpenWireFormatTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::openwire::OpenWireFormatTest );
+
+#include <activemq/cmsutil/CmsAccessorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsAccessorTest );
+#include <activemq/cmsutil/CmsDestinationAccessorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsDestinationAccessorTest );
+#include <activemq/cmsutil/CmsTemplateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::CmsTemplateTest );
+#include <activemq/cmsutil/DynamicDestinationResolverTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::DynamicDestinationResolverTest );
+#include <activemq/cmsutil/SessionPoolTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::cmsutil::SessionPoolTest );
+
+#include <activemq/core/ActiveMQConnectionFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionFactoryTest );
+#include <activemq/core/ActiveMQConnectionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQConnectionTest );
+#include <activemq/core/ActiveMQSessionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::ActiveMQSessionTest );
+#include <activemq/core/MessageDispatchChannelTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::core::MessageDispatchChannelTest );
+
+#include <activemq/state/ConnectionStateTrackerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTrackerTest );
+#include <activemq/state/ConnectionStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConnectionStateTest );
+#include <activemq/state/ConsumerStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ConsumerStateTest );
+#include <activemq/state/ProducerStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::ProducerStateTest );
+#include <activemq/state/SessionStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::SessionStateTest );
+#include <activemq/state/TransactionStateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::state::TransactionStateTest );
+
+#include <activemq/transport/failover/FailoverTransportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::failover::FailoverTransportTest );
+
+#include <activemq/transport/correlator/ResponseCorrelatorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::correlator::ResponseCorrelatorTest );
+
+#include <activemq/transport/mock/MockTransportFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::mock::MockTransportFactoryTest );
+
+#include <activemq/transport/TransportRegistryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::TransportRegistryTest );
+#include <activemq/transport/IOTransportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::transport::IOTransportTest );
+
+#include <activemq/exceptions/ActiveMQExceptionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::exceptions::ActiveMQExceptionTest );
+
+#include <activemq/util/LongSequenceGeneratorTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::LongSequenceGeneratorTest );
+#include <activemq/util/PrimitiveValueNodeTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueNodeTest );
+#include <activemq/util/PrimitiveListTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveListTest );
+#include <activemq/util/PrimitiveMapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveMapTest );
+#include <activemq/util/PrimitiveValueConverterTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::PrimitiveValueConverterTest );
+#include <activemq/util/URISupportTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::URISupportTest );
+#include <activemq/util/MemoryUsageTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::util::MemoryUsageTest );
+
+#include <activemq/threads/DedicatedTaskRunnerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::DedicatedTaskRunnerTest );
+#include <activemq/threads/CompositeTaskRunnerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::threads::CompositeTaskRunnerTest );
+
+#include <activemq/wireformat/WireFormatRegistryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( activemq::wireformat::WireFormatRegistryTest );
+
+#include <decaf/internal/util/ByteArrayAdapterTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::ByteArrayAdapterTest );
+#include <decaf/internal/util/TimerTaskHeapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::util::TimerTaskHeapTest );
+
+#include <decaf/internal/nio/ByteArrayPerspectiveTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayPerspectiveTest );
+#include <decaf/internal/nio/ByteArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ByteArrayBufferTest );
+#include <decaf/internal/nio/BufferFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::BufferFactoryTest );
+#include <decaf/internal/nio/CharArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::CharArrayBufferTest );
+#include <decaf/internal/nio/DoubleArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::DoubleArrayBufferTest );
+#include <decaf/internal/nio/FloatArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::FloatArrayBufferTest );
+#include <decaf/internal/nio/LongArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::LongArrayBufferTest );
+#include <decaf/internal/nio/IntArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::IntArrayBufferTest );
+#include <decaf/internal/nio/ShortArrayBufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::nio::ShortArrayBufferTest );
+
+#include <decaf/internal/net/URIEncoderDecoderTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIEncoderDecoderTest );
+#include <decaf/internal/net/URIHelperTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::internal::net::URIHelperTest );
+
+#include <decaf/nio/BufferTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::nio::BufferTest );
+
+#include <decaf/io/FilterInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterInputStreamTest );
+#include <decaf/io/FilterOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::FilterOutputStreamTest );
+#include <decaf/io/BufferedInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedInputStreamTest );
+#include <decaf/io/BufferedOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::BufferedOutputStreamTest );
+#include <decaf/io/ByteArrayInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayInputStreamTest );
+#include <decaf/io/ByteArrayOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::ByteArrayOutputStreamTest );
+#include <decaf/io/DataInputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataInputStreamTest );
+#include <decaf/io/DataOutputStreamTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::io::DataOutputStreamTest );
+
+#include <decaf/lang/MathTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::MathTest );
+#include <decaf/lang/ByteTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ByteTest );
+#include <decaf/lang/CharacterTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::CharacterTest );
+#include <decaf/lang/BooleanTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::BooleanTest );
+#include <decaf/lang/ShortTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ShortTest );
+#include <decaf/lang/IntegerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::IntegerTest );
+#include <decaf/lang/LongTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::LongTest );
+#include <decaf/lang/FloatTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::FloatTest );
+#include <decaf/lang/DoubleTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::DoubleTest );
+#include <decaf/lang/ExceptionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ExceptionTest );
#include <decaf/lang/ThreadTest.h>
CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::ThreadTest );
#include <decaf/lang/SystemTest.h>
CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::SystemTest );
-//#include <decaf/lang/PointerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::PointerTest );
-//
-//#include <decaf/net/SocketFactoryTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketFactoryTest );
-//#include <decaf/net/SocketTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketTest );
-//#include <decaf/net/URITest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URITest );
-//#include <decaf/net/URISyntaxExceptionTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URISyntaxExceptionTest );
-//#include <decaf/net/URLEncoderTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLEncoderTest );
-//#include <decaf/net/URLDecoderTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLDecoderTest );
-//
-//#include <decaf/util/concurrent/ConcurrentStlMapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ConcurrentStlMapTest );
-//#include <decaf/util/concurrent/CountDownLatchTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::CountDownLatchTest );
-//#include <decaf/util/concurrent/MutexTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::MutexTest );
-//#include <decaf/util/concurrent/ThreadPoolTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ThreadPoolTest );
-//#include <decaf/util/concurrent/TimeUnitTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::TimeUnitTest );
-//
-//#include <decaf/util/concurrent/atomic/AtomicBooleanTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicBooleanTest );
-//#include <decaf/util/concurrent/atomic/AtomicIntegerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicIntegerTest );
-//#include <decaf/util/concurrent/atomic/AtomicReferenceTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicReferenceTest );
-//
+#include <decaf/lang/PointerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::lang::PointerTest );
+
+#include <decaf/net/SocketFactoryTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketFactoryTest );
+#include <decaf/net/SocketTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::SocketTest );
+#include <decaf/net/URITest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URITest );
+#include <decaf/net/URISyntaxExceptionTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URISyntaxExceptionTest );
+#include <decaf/net/URLEncoderTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLEncoderTest );
+#include <decaf/net/URLDecoderTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::net::URLDecoderTest );
+
+#include <decaf/util/concurrent/ConcurrentStlMapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ConcurrentStlMapTest );
+#include <decaf/util/concurrent/CountDownLatchTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::CountDownLatchTest );
+#include <decaf/util/concurrent/MutexTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::MutexTest );
+#include <decaf/util/concurrent/ThreadPoolTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::ThreadPoolTest );
+#include <decaf/util/concurrent/TimeUnitTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::TimeUnitTest );
+
+#include <decaf/util/concurrent/atomic/AtomicBooleanTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicBooleanTest );
+#include <decaf/util/concurrent/atomic/AtomicIntegerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicIntegerTest );
+#include <decaf/util/concurrent/atomic/AtomicReferenceTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::atomic::AtomicReferenceTest );
+
#include <decaf/util/concurrent/locks/LockSupportTest.h>
CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::concurrent::locks::LockSupportTest );
-//
-//#include <decaf/util/DateTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::DateTest );
-//#include <decaf/util/UUIDTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::UUIDTest );
-//#include <decaf/util/ListTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::ListTest );
-//#include <decaf/util/StlMapTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StlMapTest );
-//#include <decaf/util/PropertiesTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PropertiesTest );
-//#include <decaf/util/QueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::QueueTest );
-//#include <decaf/util/RandomTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::RandomTest );
-//#include <decaf/util/SetTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::SetTest );
-//#include <decaf/util/StringTokenizerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StringTokenizerTest );
-//#include <decaf/util/TimerTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::TimerTest );
-//#include <decaf/util/PriorityQueueTest.h>
-//CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PriorityQueueTest );
+
+#include <decaf/util/DateTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::DateTest );
+#include <decaf/util/UUIDTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::UUIDTest );
+#include <decaf/util/ListTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::ListTest );
+#include <decaf/util/StlMapTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StlMapTest );
+#include <decaf/util/PropertiesTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PropertiesTest );
+#include <decaf/util/QueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::QueueTest );
+#include <decaf/util/RandomTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::RandomTest );
+#include <decaf/util/SetTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::SetTest );
+#include <decaf/util/StringTokenizerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::StringTokenizerTest );
+#include <decaf/util/TimerTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::TimerTest );
+#include <decaf/util/PriorityQueueTest.h>
+CPPUNIT_TEST_SUITE_REGISTRATION( decaf::util::PriorityQueueTest );

From forum: ActiveMQ - Commits

svn commit: r834930 - /activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp

2009-11-11T07:59:17Z

Author: tabish
Date: Wed Nov 11 15:59:16 2009
New Revision: 834930

URL: http://svn.apache.org/viewvc?rev=834930&view=rev
Log:
Fix the test case, it was using a retroactive topic without persistence which means with the 5.3 broker the messages were discarded, it should have been using a Queue in the first place.

Modified:
activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp

Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp?rev=834930&r1=834929&r2=834930&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/test-integration/activemq/test/ExpirationTest.cpp Wed Nov 11 15:59:16 2009
@@ -47,10 +47,11 @@

public:

- Producer( const std::string& brokerURL, const std::string& topic,
+ Producer( const std::string& brokerURL, const std::string& destination,
int numMessages, long long timeToLive ) {
this->cmsProvider.reset( new CMSProvider( brokerURL ) );
- this->cmsProvider->setDestinationName( topic );
+ this->cmsProvider->setDestinationName( destination );
+ this->cmsProvider->setTopic( false );
this->numMessages = numMessages;
this->timeToLive = timeToLive;
this->disableTimeStamps = false;
@@ -74,7 +75,10 @@
cms::MessageProducer* producer = cmsProvider->getProducer();
producer->setDeliveryMode( DeliveryMode::NON_PERSISTENT );
producer->setDisableMessageTimeStamp( disableTimeStamps );
- producer->setTimeToLive( 1 );
+
+ if( !this->disableTimeStamps ) {
+ producer->setTimeToLive( timeToLive );
+ }

// Create the Thread Id String
string threadIdStr = Integer::toString( Thread::getId() );
@@ -103,9 +107,10 @@

public:

- Consumer( const std::string& brokerURL, const std::string& topic, long waitMillis ) {
+ Consumer( const std::string& brokerURL, const std::string& destination, long waitMillis ) {
this->cmsProvider.reset( new CMSProvider( brokerURL ) );
- this->cmsProvider->setDestinationName( topic + "?consumer.retroactive=true" );
+ this->cmsProvider->setTopic( false );
+ this->cmsProvider->setDestinationName( destination );
this->waitMillis = waitMillis;
this->numReceived = 0;
}
@@ -149,13 +154,13 @@
////////////////////////////////////////////////////////////////////////////////
void ExpirationTest::testExpired() {

- string topic = UUID::randomUUID().toString();
- Producer producer( this->getBrokerURL(), topic, 1, 1 );
+ string destination = UUID::randomUUID().toString();
+ Producer producer( this->getBrokerURL(), destination, 1, 1 );
Thread producerThread( &producer );
producerThread.start();
producerThread.join();

- Consumer consumer( this->getBrokerURL(), topic, 2000 );
+ Consumer consumer( this->getBrokerURL(), destination, 2000 );
Thread consumerThread( &consumer );
consumerThread.start();
consumerThread.join();
@@ -166,14 +171,14 @@
////////////////////////////////////////////////////////////////////////////////
void ExpirationTest::testNotExpired() {

- string topic = UUID::randomUUID().toString();
- Producer producer( this->getBrokerURL(), topic, 2, 2000 );
+ string destination = UUID::randomUUID().toString();
+ Producer producer( this->getBrokerURL(), destination, 2, 2000 );
producer.setDisableTimeStamps( true );
Thread producerThread( &producer );
producerThread.start();
producerThread.join();

- Consumer consumer( this->getBrokerURL(), topic, 3000 );
+ Consumer consumer( this->getBrokerURL(), destination, 3000 );
Thread consumerThread( &consumer );
consumerThread.start();
consumerThread.join();

From forum: ActiveMQ - Commits

svn commit: r834922 - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/store/journal/ activemq-core/src/main/java/org/apache/activemq/store/kahadb/ kahadb/src/main/java/org/apache/kahadb/journal/

2009-11-11T07:50:46Z

Author: dejanb
Date: Wed Nov 11 15:50:45 2009
New Revision: 834922

URL: http://svn.apache.org/viewvc?rev=834922&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQ-2042 - shutdown if kahadb cannot access disk

Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java?rev=834922&r1=834921&r2=834922&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/journal/JournalPersistenceAdapter.java Wed Nov 11 15:50:45 2009
@@ -732,7 +732,7 @@
try {
brokerService.stop();
} catch (Exception e) {
- LOG.warn("Failure occured while stopping broker");
+ LOG.warn("Failure occured while stopping broker", e);
}
}
}.start();

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java?rev=834922&r1=834921&r2=834922&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/KahaDBPersistenceAdapter.java Wed Nov 11 15:50:45 2009
@@ -17,6 +17,8 @@
package org.apache.activemq.store.kahadb;

import org.apache.activeio.journal.Journal;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerServiceAware;
import org.apache.activemq.broker.ConnectionContext;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
@@ -37,7 +39,7 @@
* @org.apache.xbean.XBean element="kahaDB"
* @version $Revision: 1.17 $
*/
-public class KahaDBPersistenceAdapter implements PersistenceAdapter {
+public class KahaDBPersistenceAdapter implements PersistenceAdapter, BrokerServiceAware {
private KahaDBStore letter = new KahaDBStore();

@@ -364,4 +366,8 @@
public void setCheckForCorruptJournalFiles(boolean checkForCorruptJournalFiles) {
letter.setCheckForCorruptJournalFiles(checkForCorruptJournalFiles);
}
+
+ public void setBrokerService(BrokerService brokerService) {
+ letter.setBrokerService(brokerService);
+ }
}

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=834922&r1=834921&r2=834922&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Wed Nov 11 15:50:45 2009
@@ -36,6 +36,8 @@
import java.util.Map.Entry;
import java.util.concurrent.atomic.AtomicBoolean;

+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerServiceAware;
import org.apache.activemq.command.ConnectionId;
import org.apache.activemq.command.LocalTransactionId;
import org.apache.activemq.command.SubscriptionInfo;
@@ -75,8 +77,11 @@
import org.apache.kahadb.util.SequenceSet;
import org.apache.kahadb.util.StringMarshaller;
import org.apache.kahadb.util.VariableMarshaller;
+import org.springframework.core.enums.LetterCodedLabeledEnum;

-public class MessageDatabase {
+public class MessageDatabase implements BrokerServiceAware {
+
+ private BrokerService brokerService;

public static final String PROPERTY_LOG_SLOW_ACCESS_TIME = "org.apache.activemq.store.kahadb.LOG_SLOW_ACCESS_TIME";
public static final int LOG_SLOW_ACCESS_TIME = Integer.parseInt(System.getProperty(PROPERTY_LOG_SLOW_ACCESS_TIME, "500"));
@@ -259,6 +264,9 @@
}
} catch (InterruptedException e) {
// Looks like someone really wants us to exit this thread...
+ } catch (IOException ioe) {
+ LOG.error("Checkpoint failed", ioe);
+ stopBroker();
}
}
};
@@ -575,26 +583,22 @@
return journal.getNextLocation(null);
}

- protected void checkpointCleanup(final boolean cleanup) {
- try {
- long start = System.currentTimeMillis();
- synchronized (indexMutex) {
- if( !opened.get() ) {
- return;
- }
- pageFile.tx().execute(new Transaction.Closure<IOException>() {
- public void execute(Transaction tx) throws IOException {
- checkpointUpdate(tx, cleanup);
- }
- });
- }
- long end = System.currentTimeMillis();
- if( LOG_SLOW_ACCESS_TIME>0 && end-start > LOG_SLOW_ACCESS_TIME) {
- LOG.info("Slow KahaDB access: cleanup took "+(end-start));
+ protected void checkpointCleanup(final boolean cleanup) throws IOException {
+ long start = System.currentTimeMillis();
+ synchronized (indexMutex) {
+ if( !opened.get() ) {
+ return;
}
- } catch (IOException e) {
- e.printStackTrace();
+ pageFile.tx().execute(new Transaction.Closure<IOException>() {
+ public void execute(Transaction tx) throws IOException {
+ checkpointUpdate(tx, cleanup);
+ }
+ });
}
+ long end = System.currentTimeMillis();
+ if( LOG_SLOW_ACCESS_TIME>0 && end-start > LOG_SLOW_ACCESS_TIME) {
+ LOG.info("Slow KahaDB access: cleanup took "+(end-start));
+ }
}

@@ -623,7 +627,6 @@
* durring a recovery process.
*/
public Location store(JournalCommand data, boolean sync) throws IOException {
-

int size = data.serializedSizeFramed();
DataByteArrayOutputStream os = new DataByteArrayOutputStream(size + 1);
@@ -1530,4 +1533,20 @@
public void setChecksumJournalFiles(boolean checksumJournalFiles) {
this.checksumJournalFiles = checksumJournalFiles;
}
+
+ public void setBrokerService(BrokerService brokerService) {
+ this.brokerService = brokerService;
+ }
+
+ protected void stopBroker() {
+ new Thread() {
+ public void run() {
+ try {
+ brokerService.stop();
+ } catch (Exception e) {
+ LOG.warn("Failure occured while stopping broker", e);
+ }
+ }
+ }.start();
+ }
}

Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java?rev=834922&r1=834921&r2=834922&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/journal/DataFileAppender.java Wed Nov 11 15:50:45 2009
@@ -158,7 +158,7 @@
* @throws
*/
public Location storeItem(ByteSequence data, byte type, boolean sync) throws IOException {
-
+
// Write the packet our internal buffer.
int size = data.getLength() + Journal.RECORD_HEAD_SPACE;

@@ -298,6 +298,7 @@
protected void processQueue() {
DataFile dataFile = null;
RandomAccessFile file = null;
+ WriteBatch wb = null;
try {

DataByteArrayOutputStream buff = new DataByteArrayOutputStream(maxWriteBatchSize);
@@ -321,7 +322,7 @@
enqueueMutex.notify();
}

- WriteBatch wb = (WriteBatch)o;
+ wb = (WriteBatch)o;
if (dataFile != wb.dataFile) {
if (file != null) {
file.setLength(dataFile.getLength());
@@ -403,6 +404,9 @@
wb.latch.countDown();
}
} catch (IOException e) {
+ if (wb != null) {
+ wb.latch.countDown();
+ }
synchronized (enqueueMutex) {
firstAsyncException = e;
}

From forum: ActiveMQ - Commits

[jira] Commented: (AMQCPP-253) Problems with compiler aCC on HPUX

2009-11-11T07:43:52Z

[ https://issues.apache.org/activemq/browse/AMQCPP-253?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=55310#action_55310 ]

Timothy Bish commented on AMQCPP-253:
-------------------------------------

The warnings could be of use but I don't think they are the cause of this error. This looks more like the compiler is having an issue with the member template dynamicCast in the Pointer class which is odd since the library uses this extensively. My first guess is that there is something not getting passed to the compiler for the exe that is getting passed to the compiler when building the lib, have you check the output of the call to aCC for a file in the lib vs a file in the examples build?

I don't know why you couldn't attach the file, the included amq_cpp_30.tar for this issue is 60KB so you are under that. Worse case you can send it to me via email but I'd verify those compiler settings first.

> Problems with compiler aCC on HPUX
> ----------------------------------
>
> Key: AMQCPP-253
> URL: https://issues.apache.org/activemq/browse/AMQCPP-253
> Project: ActiveMQ C++ Client
> Issue Type: Improvement
> Affects Versions: 3.0
> Environment: HP-UX gemma1 B.11.23 U 9000/800
> aCC: HP ANSI C++ B3910B A.03.77
> Reporter: Wolfgang.Klein
> Assignee: Timothy Bish
> Priority: Minor
> Fix For: 3.1
>
> Attachments: amq_cpp_30.tar, TcpSocket.cpp
>
>
> compile errors with native HP compiler

--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.

From forum: ActiveMQ - Dev

[jira] Created: (AMQ-2486) systemExitOnShutdown="true" causes broker shutdown to hang

2009-11-11T07:41:52Z

systemExitOnShutdown="true" causes broker shutdown to hang
----------------------------------------------------------

Key: AMQ-2486
URL: https://issues.apache.org/activemq/browse/AMQ-2486
Project: ActiveMQ
Issue Type: Bug
Components: Broker
Affects Versions: 5.3.0
Reporter: Dejan Bosanac
Assignee: Dejan Bosanac

To reproduce:

* add systemExitOnShutdown="true" to the <broker> tag
* start a broker
* try to stop the broker

--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.

From forum: ActiveMQ - Dev