Author: tabish
Date: Mon Nov 27 10:26:18 2006
New Revision: 479711
URL: http://svn.apache.org/viewvc?view=rev&rev=479711
Log:
http://issues.apache.org/activemq/browse/AMQCPP-16
CMS API Updates
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/DateTest.h
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/openwire/commands/ActiveMQBytesMessage.h
Mon Nov 27 10:26:18 2006
@@ -253,7 +253,8 @@
* @throws CMSException
*/
virtual void setBodyBytes(
- const unsigned char* buffer, const unsigned long numBytes )
+ const unsigned char* buffer,
+ const unsigned long long numBytes )
throw( cms::CMSException );
/**
@@ -269,7 +270,7 @@
* Returns the number of bytes contained in the body of this message.
* @return number of bytes.
*/
- virtual unsigned long getBodyLength(void) const;
+ virtual unsigned long long getBodyLength(void) const;
};
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/StompFrame.h
Mon Nov 27 10:26:18 2006
@@ -98,14 +98,14 @@
* Return the number of bytes contained in this frames body
* @return Body bytes length.
*/
- int getBodyLength(void) const{ return bodyLength; }
+ long long getBodyLength(void) const{ return bodyLength; }
/**
* Sets the body data of this frame as a byte sequence.
* @param bytes The byte buffer to be set in the body.
* @param numBytes The number of bytes in the buffer.
*/
- void setBody( const char* bytes, const int numBytes ){
+ void setBody( const char* bytes, const long long numBytes ){
body = bytes;
bodyLength = numBytes;
}
@@ -120,7 +120,7 @@
// Byte data of Body.
const char* body;
- int bodyLength;
+ long long bodyLength;
};
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/AbstractCommand.h
Mon Nov 27 10:26:18 2006
@@ -249,7 +249,7 @@
* Fetch the number of bytes in the Stomp Frame Body
* @return number of bytes
*/
- virtual unsigned long getNumBytes(void) const{
+ virtual unsigned long long getNumBytes(void) const{
return getFrame().getBodyLength();
}
@@ -271,7 +271,7 @@
* be set
*/
virtual void setBytes( const char* bytes,
- const unsigned long numBytes,
+ const unsigned long long numBytes,
const bool setContentLength = true )
{
char* copy = new char[numBytes];
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/connector/stomp/commands/BytesMessageCommand.h
Mon Nov 27 10:26:18 2006
@@ -64,7 +64,7 @@
* @throws CMSException
*/
virtual void setBodyBytes( const unsigned char* buffer,
- const unsigned long numBytes )
+ const unsigned long long numBytes )
throw( cms::CMSException ) {
this->setBytes(
reinterpret_cast<const char*>( buffer ), numBytes );
@@ -86,7 +86,7 @@
* Returns the number of bytes contained in the body of this message.
* @return number of bytes.
*/
- virtual unsigned long getBodyLength(void) const {
+ virtual unsigned long long getBodyLength(void) const {
return this->getNumBytes();
}
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.cpp
Mon Nov 27 10:26:18 2006
@@ -359,7 +359,7 @@
////////////////////////////////////////////////////////////////////////////////
cms::BytesMessage* ActiveMQSession::createBytesMessage(
const unsigned char* bytes,
- unsigned long bytesSize )
+ unsigned long long bytesSize )
throw ( cms::CMSException )
{
try
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/activemq/core/ActiveMQSession.h
Mon Nov 27 10:26:18 2006
@@ -175,7 +175,7 @@
*/
virtual cms::BytesMessage* createBytesMessage(
const unsigned char* bytes,
- unsigned long bytesSize )
+ unsigned long long bytesSize )
throw ( cms::CMSException );
/**
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/BytesMessage.h
Mon Nov 27 10:26:18 2006
@@ -35,7 +35,7 @@
* @throws CMSException
*/
virtual void setBodyBytes(
- const unsigned char* buffer, const unsigned long numBytes )
+ const unsigned char* buffer, const unsigned long long numBytes )
throw( CMSException ) = 0;
/**
@@ -51,7 +51,7 @@
* Returns the number of bytes contained in the body of this message.
* @return number of bytes.
*/
- virtual unsigned long getBodyLength(void) const = 0;
+ virtual unsigned long long getBodyLength(void) const = 0;
};
}
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
--- incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
(original)
+++ incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/main/cms/Session.h
Mon Nov 27 10:26:18 2006
@@ -196,7 +196,7 @@
*/
virtual BytesMessage* createBytesMessage(
const unsigned char* bytes,
- unsigned long bytesSize )
+ unsigned long long bytesSize )
throw ( CMSException) = 0;
/**
Modified:
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/DateTest.h
URL:
http://svn.apache.org/viewvc/incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/DateTest.h?view=diff&rev=479711&r1=479710&r2=479711
==============================================================================
---
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/DateTest.h
(original)
+++
incubator/activemq/activemq-cpp/trunk/activemq-cpp/src/test/activemq/util/DateTest.h
Mon Nov 27 10:26:18 2006
@@ -42,9 +42,10 @@
Date date1;
CPPUNIT_ASSERT( date1.getTime() != 0 );
- activemq::concurrent::Thread::sleep(10);
+ activemq::concurrent::Thread::sleep(55);
Date date2;
+
CPPUNIT_ASSERT( date1.before(date2) == true );
CPPUNIT_ASSERT( date1.after(date2) == false );
