Author: tabish
Date: Fri Nov 9 11:25:00 2007
New Revision: 593628
URL: http://svn.apache.org/viewvc?rev=593628&view=rev
Log:
http://issues.apache.org/activemq/browse/AMQCPP-103
Modified:
activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
Modified: activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h?rev=593628&r1=593627&r2=593628&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
(original)
+++ activemq/activemq-cpp/trunk/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
Fri Nov 9 11:25:00 2007
@@ -21,8 +21,8 @@
#include <cms/BytesMessage.h>
#include <activemq/connector/stomp/commands/StompMessage.h>
#include <activemq/connector/stomp/commands/CommandConstants.h>
+#include <activemq/exceptions/ActiveMQException.h>
#include <decaf/lang/Long.h>
-#include <decaf/lang/exceptions/IllegalStateException.h>
#include <decaf/io/ByteArrayInputStream.h>
#include <decaf/io/ByteArrayOutputStream.h>
#include <decaf/io/DataInputStream.h>
@@ -520,7 +520,7 @@
*/
void checkWriteOnly() const throw (cms::CMSException){
if( readOnly ){
- throw decaf::lang::exceptions::IllegalStateException( __FILE__, __LINE__,
+ throw activemq::exceptions::ActiveMQException( __FILE__, __LINE__,
"message is in read-only mode and cannot be written to" );
}
}
@@ -531,7 +531,7 @@
*/
void checkReadOnly() const throw (cms::CMSException){
if( !readOnly ){
- throw decaf::lang::exceptions::IllegalStateException( __FILE__, __LINE__,
+ throw activemq::exceptions::ActiveMQException( __FILE__, __LINE__,
"message is in write-only mode and cannot be read from" );
}
}
Modified: activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h?rev=593628&r1=593627&r2=593628&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
(original)
+++ activemq/activemq-cpp/trunk/src/test/activemq/connector/stomp/commands/BytesMessageCommandTest.h
Fri Nov 9 11:25:00 2007
@@ -230,67 +230,67 @@
try{
cmd.setBodyBytes( (unsigned char*)"test", 5 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeBoolean( true );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeByte( 2 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeBytes( std::vector<unsigned char>() );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeBytes( (unsigned char*)"test", 0, 5 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeChar( 'a' );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeFloat( 1.0f );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeDouble( 1.0 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeUnsignedShort( 3 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeShort( 4 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeInt( 5 );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeLong( 6LL );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.writeString( "test" );
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
// Now, verify that all the reads work properly
@@ -315,58 +315,58 @@
try{
cmd.readBoolean();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readByte();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
std::vector<unsigned char> buf;
cmd.readBytes(buf);
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readChar();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readFloat();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readDouble();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readUnsignedShort();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readShort();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readInt();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readLong();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
try{
cmd.readString();
CPPUNIT_ASSERT( false );
- } catch( decaf::lang::exceptions::IllegalStateException& e ){}
+ } catch( activemq::exceptions::ActiveMQException& e ){}
// Now, verify that all the writes work properly
|