You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2010/07/02 21:04:50 UTC
svn commit: r960088 [5/9] - in
/activemq/activemq-cpp/trunk/activemq-cpp/src/main: activemq/cmsutil/
activemq/commands/ activemq/core/ activemq/io/ activemq/transport/failover/
activemq/transport/mock/ activemq/wireformat/stomp/ decaf/internal/io/
deca...
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStream.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStream.h Fri Jul 2 19:04:44 2010
@@ -61,14 +61,14 @@ namespace io{
*
* The default implementation of this method does nothing.
*/
- virtual void close() throw( decaf::io::IOException );
+ virtual void close();
/**
* {@inheritDoc}
*
* The default implementation of this method does nothing.
*/
- virtual void flush() throw( decaf::io::IOException );
+ virtual void flush();
/**
* Writes a single byte to the output stream.
@@ -81,7 +81,7 @@ namespace io{
*
* @throws IOException if an I/O error occurs.
*/
- virtual void write( unsigned char c ) throw ( decaf::io::IOException );
+ virtual void write( unsigned char c );
/**
* Writes an array of bytes to the output stream. The entire contents of
@@ -101,10 +101,7 @@ namespace io{
* @throws NullPointerException thrown if buffer is Null.
* @throws IndexOutOfBoundsException if size value is negative.
*/
- virtual void write( const unsigned char* buffer, int size )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void write( const unsigned char* buffer, int size );
/**
* Writes an array of bytes to the output stream in order starting at buffer[offset]
@@ -130,10 +127,7 @@ namespace io{
* @throws IndexOutOfBoundsException if the offset + length > size. or one of the
* parameters is negative.
*/
- virtual void write( const unsigned char* buffer, int size, int offset, int length )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void write( const unsigned char* buffer, int size, int offset, int length );
/**
* Output a String representation of this object.
@@ -146,66 +140,43 @@ namespace io{
protected:
- virtual void doWriteByte( unsigned char value )
- throw( decaf::io::IOException ) = 0;
+ virtual void doWriteByte( unsigned char value ) = 0;
- virtual void doWriteArray( const unsigned char* buffer, int size )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
-
- virtual void doWriteArrayBounded( const unsigned char* buffer, int size, int offset, int length )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void doWriteArray( const unsigned char* buffer, int size );
+
+ virtual void doWriteArrayBounded( const unsigned char* buffer, int size, int offset, int length );
public: // Synchronizable
- virtual void lock() throw( decaf::lang::exceptions::RuntimeException ) {
+ virtual void lock() {
mutex.lock();
}
- virtual bool tryLock() throw( decaf::lang::exceptions::RuntimeException ) {
+ virtual bool tryLock() {
return mutex.tryLock();
}
- virtual void unlock() throw( decaf::lang::exceptions::RuntimeException ) {
+ virtual void unlock() {
mutex.unlock();
}
- virtual void wait() throw( decaf::lang::exceptions::RuntimeException,
- decaf::lang::exceptions::IllegalMonitorStateException,
- decaf::lang::exceptions::InterruptedException ) {
-
+ virtual void wait() {
mutex.wait();
}
- virtual void wait( long long millisecs )
- throw( decaf::lang::exceptions::RuntimeException,
- decaf::lang::exceptions::IllegalMonitorStateException,
- decaf::lang::exceptions::InterruptedException ) {
-
+ virtual void wait( long long millisecs ) {
mutex.wait( millisecs );
}
- virtual void wait( long long millisecs, int nanos )
- throw( decaf::lang::exceptions::RuntimeException,
- decaf::lang::exceptions::IllegalArgumentException,
- decaf::lang::exceptions::IllegalMonitorStateException,
- decaf::lang::exceptions::InterruptedException ) {
-
+ virtual void wait( long long millisecs, int nanos ) {
mutex.wait( millisecs, nanos );
}
- virtual void notify() throw( decaf::lang::exceptions::RuntimeException,
- decaf::lang::exceptions::IllegalMonitorStateException ) {
-
+ virtual void notify() {
mutex.notify();
}
- virtual void notifyAll() throw( decaf::lang::exceptions::RuntimeException,
- decaf::lang::exceptions::IllegalMonitorStateException ) {
-
+ virtual void notifyAll() {
mutex.notifyAll();
}
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.cpp Fri Jul 2 19:04:44 2010
@@ -55,7 +55,7 @@ OutputStreamWriter::~OutputStreamWriter(
}
////////////////////////////////////////////////////////////////////////////////
-void OutputStreamWriter::close() throw( decaf::io::IOException ) {
+void OutputStreamWriter::close() {
try{
@@ -69,7 +69,7 @@ void OutputStreamWriter::close() throw(
}
////////////////////////////////////////////////////////////////////////////////
-void OutputStreamWriter::flush() throw( decaf::io::IOException ) {
+void OutputStreamWriter::flush() {
try{
checkClosed();
@@ -80,10 +80,7 @@ void OutputStreamWriter::flush() throw(
}
////////////////////////////////////////////////////////////////////////////////
-void OutputStreamWriter::doWriteArrayBounded( const char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+void OutputStreamWriter::doWriteArrayBounded( const char* buffer, int size, int offset, int length ) {
try{
checkClosed();
@@ -101,7 +98,7 @@ void OutputStreamWriter::doWriteArrayBou
}
////////////////////////////////////////////////////////////////////////////////
-void OutputStreamWriter::checkClosed() const throw( decaf::io::IOException ) {
+void OutputStreamWriter::checkClosed() const {
if( closed ) {
throw IOException( __FILE__, __LINE__, "This Writer is Closed" );
}
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/OutputStreamWriter.h Fri Jul 2 19:04:44 2010
@@ -67,19 +67,16 @@ namespace io {
virtual ~OutputStreamWriter();
- virtual void close() throw( decaf::io::IOException );
+ virtual void close();
- virtual void flush() throw( decaf::io::IOException );
+ virtual void flush();
protected:
- virtual void doWriteArrayBounded( const char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void doWriteArrayBounded( const char* buffer, int size, int offset, int length );
// Used to check state and throw error when closed.
- virtual void checkClosed() const throw( decaf::io::IOException );
+ virtual void checkClosed() const;
};
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.cpp Fri Jul 2 19:04:44 2010
@@ -32,7 +32,6 @@ PushbackInputStream::PushbackInputStream
////////////////////////////////////////////////////////////////////////////////
PushbackInputStream::PushbackInputStream( InputStream* stream, int bufSize, bool own )
- throw( decaf::lang::exceptions::IllegalArgumentException )
: FilterInputStream( stream, own ), buffer( NULL ), bufferSize( bufSize ), pos( bufSize ) {
if( bufSize < 0 ) {
@@ -55,7 +54,7 @@ PushbackInputStream::~PushbackInputStrea
}
////////////////////////////////////////////////////////////////////////////////
-int PushbackInputStream::available() const throw ( decaf::io::IOException ) {
+int PushbackInputStream::available() const {
try{
return ( this->bufferSize - this->pos ) + inputStream->available();
@@ -65,9 +64,7 @@ int PushbackInputStream::available() con
}
////////////////////////////////////////////////////////////////////////////////
-long long PushbackInputStream::skip( long long num )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::UnsupportedOperationException ) {
+long long PushbackInputStream::skip( long long num ) {
try{
@@ -104,14 +101,13 @@ void PushbackInputStream::mark( int read
}
////////////////////////////////////////////////////////////////////////////////
-void PushbackInputStream::reset() throw ( decaf::io::IOException ) {
+void PushbackInputStream::reset() {
throw IOException(
__FILE__, __LINE__, "Reset is not Supported by the PushbackInputStream." );
}
////////////////////////////////////////////////////////////////////////////////
-void PushbackInputStream::unread( unsigned char value )
- throw( decaf::io::IOException ) {
+void PushbackInputStream::unread( unsigned char value ) {
try{
@@ -127,10 +123,7 @@ void PushbackInputStream::unread( unsign
}
////////////////////////////////////////////////////////////////////////////////
-void PushbackInputStream::unread( const unsigned char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException ) {
+void PushbackInputStream::unread( const unsigned char* buffer, int size ) {
try{
@@ -147,10 +140,7 @@ void PushbackInputStream::unread( const
}
////////////////////////////////////////////////////////////////////////////////
-void PushbackInputStream::unread( const unsigned char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException ) {
+void PushbackInputStream::unread( const unsigned char* buffer, int size, int offset, int length ) {
try{
@@ -189,7 +179,7 @@ void PushbackInputStream::unread( const
}
////////////////////////////////////////////////////////////////////////////////
-int PushbackInputStream::doReadByte() throw ( decaf::io::IOException ) {
+int PushbackInputStream::doReadByte() {
try{
@@ -209,10 +199,7 @@ int PushbackInputStream::doReadByte() th
}
////////////////////////////////////////////////////////////////////////////////
-int PushbackInputStream::doReadArrayBounded( unsigned char* buffer, int size, int offset, int length )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException ) {
+int PushbackInputStream::doReadArrayBounded( unsigned char* buffer, int size, int offset, int length ) {
try{
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/PushbackInputStream.h Fri Jul 2 19:04:44 2010
@@ -77,8 +77,7 @@ namespace io {
*
* @throws IllegalArgumentException if the bufSize argument is < zero.
*/
- PushbackInputStream( InputStream* stream, int bufSize, bool own = false )
- throw( decaf::lang::exceptions::IllegalArgumentException );
+ PushbackInputStream( InputStream* stream, int bufSize, bool own = false );
virtual ~PushbackInputStream();
@@ -92,8 +91,7 @@ namespace io {
* @throws IOException if there is not enough space in the pushback buffer or this stream
* has already been closed.
*/
- void unread( unsigned char value )
- throw( decaf::io::IOException );
+ void unread( unsigned char value );
/**
* Pushes back the given array of bytes, the bytes are copied to the front of the pushback
@@ -109,10 +107,7 @@ namespace io {
* @throws IOException if there is not enough space in the pushback buffer or this stream
* has already been closed.
*/
- void unread( const unsigned char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException );
+ void unread( const unsigned char* buffer, int size );
/**
* Pushes back the given array of bytes, the bytes are copied to the front of the pushback
@@ -132,10 +127,7 @@ namespace io {
* @throws IOException if there is not enough space in the pushback buffer or this stream
* has already been closed.
*/
- void unread( const unsigned char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException );
+ void unread( const unsigned char* buffer, int size, int offset, int length );
/**
* {@inheritDoc}
@@ -143,7 +135,7 @@ namespace io {
* Returns the sum of the number of pushed back bytes if any and the amount of bytes
* available in the underlying stream via a call to available.
*/
- virtual int available() const throw ( decaf::io::IOException );
+ virtual int available() const;
/**
* {@inheritDoc}
@@ -152,9 +144,7 @@ namespace io {
* complete the request by calling the underlying stream skip method with the remainder
* of bytes that needs to be skipped.
*/
- virtual long long skip( long long num )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::UnsupportedOperationException );
+ virtual long long skip( long long num );
/**
* Does nothing except throw an IOException.
@@ -168,7 +158,7 @@ namespace io {
*
* {@inheritDoc}
*/
- virtual void reset() throw ( decaf::io::IOException );
+ virtual void reset();
/**
* Does nothing except throw an IOException.
@@ -181,12 +171,9 @@ namespace io {
protected:
- virtual int doReadByte() throw ( decaf::io::IOException );
+ virtual int doReadByte();
- virtual int doReadArrayBounded( unsigned char* buffer, int size, int offset, int length )
- throw ( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException );
+ virtual int doReadArrayBounded( unsigned char* buffer, int size, int offset, int length );
};
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.cpp Fri Jul 2 19:04:44 2010
@@ -38,8 +38,7 @@ Reader::~Reader() {
}
////////////////////////////////////////////////////////////////////////////////
-void Reader::mark( int readAheadLimit DECAF_UNUSED )
- throw( decaf::io::IOException ) {
+void Reader::mark( int readAheadLimit DECAF_UNUSED ) {
throw IOException(
__FILE__, __LINE__,
@@ -47,12 +46,12 @@ void Reader::mark( int readAheadLimit DE
}
////////////////////////////////////////////////////////////////////////////////
-bool Reader::ready() const throw( decaf::io::IOException ) {
+bool Reader::ready() const {
return false;
}
////////////////////////////////////////////////////////////////////////////////
-void Reader::reset() throw( decaf::io::IOException ) {
+void Reader::reset() {
throw IOException(
__FILE__, __LINE__,
@@ -60,8 +59,7 @@ void Reader::reset() throw( decaf::io::I
}
////////////////////////////////////////////////////////////////////////////////
-long long Reader::skip( long long count )
- throw( decaf::io::IOException ) {
+long long Reader::skip( long long count ) {
try{
@@ -96,7 +94,7 @@ long long Reader::skip( long long count
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::read( std::vector<char>& buffer ) throw( decaf::io::IOException ) {
+int Reader::read( std::vector<char>& buffer ) {
try{
return this->doReadVector( buffer );
@@ -106,9 +104,7 @@ int Reader::read( std::vector<char>& buf
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::read( char* buffer, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException ) {
+int Reader::read( char* buffer, int length ) {
try{
return this->doReadArray( buffer, length );
@@ -118,10 +114,7 @@ int Reader::read( char* buffer, int leng
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::read( char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException ) {
+int Reader::read( char* buffer, int size, int offset, int length ) {
try{
return this->doReadArrayBounded( buffer, size, offset, length );
@@ -131,7 +124,7 @@ int Reader::read( char* buffer, int size
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::read() throw( IOException ) {
+int Reader::read() {
try{
return this->doReadChar();
@@ -141,10 +134,7 @@ int Reader::read() throw( IOException )
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::read( decaf::nio::CharBuffer* charBuffer )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::nio::ReadOnlyBufferException ) {
+int Reader::read( decaf::nio::CharBuffer* charBuffer ) {
try{
// Error checking is done in the Impl.
@@ -157,8 +147,7 @@ int Reader::read( decaf::nio::CharBuffer
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::doReadVector( std::vector<char>& buffer )
- throw( decaf::io::IOException ) {
+int Reader::doReadVector( std::vector<char>& buffer ) {
try{
@@ -173,9 +162,7 @@ int Reader::doReadVector( std::vector<ch
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::doReadArray( char* buffer, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException ) {
+int Reader::doReadArray( char* buffer, int length ) {
try{
@@ -190,7 +177,7 @@ int Reader::doReadArray( char* buffer, i
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::doReadChar() throw( decaf::io::IOException ) {
+int Reader::doReadChar() {
try{
@@ -207,10 +194,7 @@ int Reader::doReadChar() throw( decaf::i
}
////////////////////////////////////////////////////////////////////////////////
-int Reader::doReadCharBuffer( decaf::nio::CharBuffer* charBuffer )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::nio::ReadOnlyBufferException ) {
+int Reader::doReadCharBuffer( decaf::nio::CharBuffer* charBuffer ) {
try{
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Reader.h Fri Jul 2 19:04:44 2010
@@ -63,7 +63,7 @@ namespace io{
*
* @throw IOException if an I/O error occurs, or the stream does not support mark.
*/
- virtual void mark( int readAheadLimit ) throw( decaf::io::IOException );
+ virtual void mark( int readAheadLimit );
/**
* Tells whether this stream supports the mark() operation. The default implementation
@@ -83,7 +83,7 @@ namespace io{
*
* @throw IOException if an I/O error occurs.
*/
- virtual bool ready() const throw( decaf::io::IOException );
+ virtual bool ready() const;
/**
* Resets the stream. If the stream has been marked, then attempt to reposition it at the
@@ -94,7 +94,7 @@ namespace io{
*
* @throw IOException if an I/O error occurs.
*/
- virtual void reset() throw( decaf::io::IOException );
+ virtual void reset();
/**
* Skips characters. This method will block until some characters are available, an I/O error
@@ -107,7 +107,7 @@ namespace io{
*
* @throw IOException if an I/O error occurs.
*/
- virtual long long skip( long long count ) throw( decaf::io::IOException );
+ virtual long long skip( long long count );
/**
* Reads characters into an array. This method will block until some input is available,
@@ -120,7 +120,7 @@ namespace io{
*
* @throws IOException thrown if an I/O error occurs.
*/
- virtual int read( std::vector<char>& buffer ) throw( decaf::io::IOException );
+ virtual int read( std::vector<char>& buffer );
/**
* Reads characters into an array, the method will attempt to read as much data as the size
@@ -137,9 +137,7 @@ namespace io{
* @throws IOException thrown if an I/O error occurs.
* @throws NullPointerException if buffer is NULL.
*/
- virtual int read( char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException );
+ virtual int read( char* buffer, int size );
/**
* Reads characters into a portion of an array. This method will block until some input
@@ -160,10 +158,7 @@ namespace io{
* @throws NullPointerException if buffer is NULL.
* @throws IndexOutOfBoundsException if the offset + length is greater than the array size.
*/
- virtual int read( char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException,
- decaf::lang::exceptions::NullPointerException );
+ virtual int read( char* buffer, int size, int offset, int length );
/**
* Reads a single character. This method will block until a character is available,
@@ -177,12 +172,9 @@ namespace io{
*
* @throws IOException thrown if an I/O error occurs.
*/
- virtual int read() throw( decaf::io::IOException );
+ virtual int read();
- virtual int read( decaf::nio::CharBuffer* charBuffer )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::nio::ReadOnlyBufferException );
+ virtual int read( decaf::nio::CharBuffer* charBuffer );
protected:
@@ -193,10 +185,7 @@ namespace io{
* All subclasses must override this method to provide the basic Reader
* functionality.
*/
- virtual int doReadArrayBounded( char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) = 0;
+ virtual int doReadArrayBounded( char* buffer, int size, int offset, int length ) = 0;
protected:
@@ -204,31 +193,25 @@ namespace io{
* Override this method to customize the functionality of the method
* read( std::vector<char>& buffer ).
*/
- virtual int doReadVector( std::vector<char>& buffer )
- throw( decaf::io::IOException );
+ virtual int doReadVector( std::vector<char>& buffer );
/**
* Override this method to customize the functionality of the method
* read( char* buffer, std::size_t length ).
*/
- virtual int doReadArray( char* buffer, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException );
+ virtual int doReadArray( char* buffer, int length );
/**
* Override this method to customize the functionality of the method
* read().
*/
- virtual int doReadChar() throw( decaf::io::IOException );
+ virtual int doReadChar();
/**
* Override this method to customize the functionality of the method
* read( CharBuffer* charBuffer ).
*/
- virtual int doReadCharBuffer( decaf::nio::CharBuffer* charBuffer )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::nio::ReadOnlyBufferException );
+ virtual int doReadCharBuffer( decaf::nio::CharBuffer* charBuffer );
};
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.cpp Fri Jul 2 19:04:44 2010
@@ -36,7 +36,7 @@ Writer::~Writer() {
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::write( char v ) throw( IOException ) {
+void Writer::write( char v ) {
try {
this->doWriteChar( v );
@@ -46,7 +46,7 @@ void Writer::write( char v ) throw( IOEx
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::write( const std::vector<char>& buffer ) throw( IOException ) {
+void Writer::write( const std::vector<char>& buffer ) {
try {
this->doWriteVector( buffer );
@@ -56,9 +56,7 @@ void Writer::write( const std::vector<ch
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::write( const char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException ) {
+void Writer::write( const char* buffer, int size ) {
try {
this->doWriteArray( buffer, size );
@@ -69,10 +67,7 @@ void Writer::write( const char* buffer,
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::write( const char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+void Writer::write( const char* buffer, int size, int offset, int length ) {
try {
this->doWriteArrayBounded( buffer, size, offset, length );
@@ -84,7 +79,7 @@ void Writer::write( const char* buffer,
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::write( const std::string& str ) throw( IOException ) {
+void Writer::write( const std::string& str ) {
try {
this->doWriteString( str );
@@ -94,8 +89,7 @@ void Writer::write( const std::string& s
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::write( const std::string& str, int offset, int length )
- throw( IOException, IndexOutOfBoundsException ) {
+void Writer::write( const std::string& str, int offset, int length ) {
try {
@@ -112,7 +106,7 @@ void Writer::write( const std::string& s
}
////////////////////////////////////////////////////////////////////////////////
-Appendable& Writer::append( char value ) throw( decaf::io::IOException ) {
+Appendable& Writer::append( char value ) {
try {
return this->doAppendChar( value );
@@ -122,8 +116,7 @@ Appendable& Writer::append( char value )
}
////////////////////////////////////////////////////////////////////////////////
-Appendable& Writer::append( const decaf::lang::CharSequence* csq )
- throw ( decaf::io::IOException ) {
+Appendable& Writer::append( const decaf::lang::CharSequence* csq ) {
try {
return this->doAppendCharSequence( csq );
@@ -133,9 +126,7 @@ Appendable& Writer::append( const decaf:
}
////////////////////////////////////////////////////////////////////////////////
-Appendable& Writer::append( const decaf::lang::CharSequence* csq, int start, int end )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+Appendable& Writer::append( const decaf::lang::CharSequence* csq, int start, int end ) {
try {
return this->doAppendCharSequenceStartEnd( csq, start, end );
@@ -146,7 +137,7 @@ Appendable& Writer::append( const decaf:
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::doWriteChar( char v ) throw( decaf::io::IOException ) {
+void Writer::doWriteChar( char v ) {
try {
this->doWriteArrayBounded( (const char*)&v, 1, 0, 1 );
@@ -156,8 +147,7 @@ void Writer::doWriteChar( char v ) throw
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::doWriteVector( const std::vector<char>& buffer )
- throw( decaf::io::IOException ) {
+void Writer::doWriteVector( const std::vector<char>& buffer ) {
try {
this->doWriteArrayBounded( &buffer[0], (int)buffer.size(), 0, (int)buffer.size() );
@@ -167,9 +157,7 @@ void Writer::doWriteVector( const std::v
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::doWriteArray( const char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException ) {
+void Writer::doWriteArray( const char* buffer, int size ) {
try {
this->doWriteArrayBounded( buffer, size, 0, size );
@@ -180,7 +168,7 @@ void Writer::doWriteArray( const char* b
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::doWriteString( const std::string& str ) throw( decaf::io::IOException ) {
+void Writer::doWriteString( const std::string& str ) {
try {
this->doWriteArrayBounded( str.c_str(), (int)str.length(), 0, (int)str.length() );
@@ -190,9 +178,7 @@ void Writer::doWriteString( const std::s
}
////////////////////////////////////////////////////////////////////////////////
-void Writer::doWriteStringBounded( const std::string& str, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+void Writer::doWriteStringBounded( const std::string& str, int offset, int length ) {
try {
this->doWriteArrayBounded( str.c_str(), (int)str.length(), offset, length );
@@ -203,7 +189,7 @@ void Writer::doWriteStringBounded( const
}
////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Appendable& Writer::doAppendChar( char value ) throw( decaf::io::IOException ) {
+decaf::lang::Appendable& Writer::doAppendChar( char value ) {
try {
this->doWriteChar( value );
@@ -214,8 +200,7 @@ decaf::lang::Appendable& Writer::doAppen
}
////////////////////////////////////////////////////////////////////////////////
-decaf::lang::Appendable& Writer::doAppendCharSequence( const decaf::lang::CharSequence* csq )
- throw ( decaf::io::IOException ) {
+decaf::lang::Appendable& Writer::doAppendCharSequence( const decaf::lang::CharSequence* csq ) {
try {
@@ -233,9 +218,7 @@ decaf::lang::Appendable& Writer::doAppen
////////////////////////////////////////////////////////////////////////////////
decaf::lang::Appendable& Writer::doAppendCharSequenceStartEnd( const decaf::lang::CharSequence* csq,
- int start, int end )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) {
+ int start, int end ) {
try {
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/io/Writer.h Fri Jul 2 19:04:44 2010
@@ -60,7 +60,7 @@ namespace io{
*
* @throws IOException thrown if an error occurs.
*/
- virtual void write( char v ) throw( decaf::io::IOException );
+ virtual void write( char v );
/**
* Writes an array of Chars
@@ -70,8 +70,7 @@ namespace io{
*
* @throws IOException thrown if an error occurs.
*/
- virtual void write( const std::vector<char>& buffer )
- throw( decaf::io::IOException );
+ virtual void write( const std::vector<char>& buffer );
/**
* Writes a byte array to the output stream.
@@ -84,9 +83,7 @@ namespace io{
* @throws IOException if an I/O error occurs.
* @throws NullPointerException if buffer is NULL.
*/
- virtual void write( const char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException );
+ virtual void write( const char* buffer, int size );
/**
* Writes a byte array to the output stream.
@@ -104,10 +101,7 @@ namespace io{
* @throws NullPointerException if buffer is NULL.
* @throws IndexOutOfBoundsException if offset + length > size of the buffer.
*/
- virtual void write( const char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void write( const char* buffer, int size, int offset, int length );
/**
* Writes a string
@@ -117,7 +111,7 @@ namespace io{
*
* @throws IOException thrown if an error occurs.
*/
- virtual void write( const std::string& str ) throw( decaf::io::IOException );
+ virtual void write( const std::string& str );
/**
* Writes a string
@@ -132,18 +126,13 @@ namespace io{
* @throws IOException thrown if an error occurs.
* @throws IndexOutOfBoundsException if offset+length is greater than the string length.
*/
- virtual void write( const std::string& str, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
-
- virtual decaf::lang::Appendable& append( char value ) throw( decaf::io::IOException );
-
- virtual decaf::lang::Appendable& append( const decaf::lang::CharSequence* csq )
- throw ( decaf::io::IOException );
-
- virtual decaf::lang::Appendable& append( const decaf::lang::CharSequence* csq, int start, int end )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void write( const std::string& str, int offset, int length );
+
+ virtual decaf::lang::Appendable& append( char value );
+
+ virtual decaf::lang::Appendable& append( const decaf::lang::CharSequence* csq );
+
+ virtual decaf::lang::Appendable& append( const decaf::lang::CharSequence* csq, int start, int end );
protected:
@@ -154,37 +143,26 @@ namespace io{
* All subclasses must override this method to provide the basic Writer
* functionality.
*/
- virtual void doWriteArrayBounded( const char* buffer, int size, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException,
- decaf::lang::exceptions::IndexOutOfBoundsException ) = 0;
+ virtual void doWriteArrayBounded( const char* buffer, int size, int offset, int length ) = 0;
protected:
- virtual void doWriteChar( char v ) throw( decaf::io::IOException );
+ virtual void doWriteChar( char v );
- virtual void doWriteVector( const std::vector<char>& buffer )
- throw( decaf::io::IOException );
+ virtual void doWriteVector( const std::vector<char>& buffer );
- virtual void doWriteArray( const char* buffer, int size )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::NullPointerException );
+ virtual void doWriteArray( const char* buffer, int size );
- virtual void doWriteString( const std::string& str ) throw( decaf::io::IOException );
+ virtual void doWriteString( const std::string& str );
- virtual void doWriteStringBounded( const std::string& str, int offset, int length )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ virtual void doWriteStringBounded( const std::string& str, int offset, int length );
- virtual decaf::lang::Appendable& doAppendChar( char value ) throw( decaf::io::IOException );
+ virtual decaf::lang::Appendable& doAppendChar( char value );
- virtual decaf::lang::Appendable& doAppendCharSequence( const decaf::lang::CharSequence* csq )
- throw ( decaf::io::IOException );
+ virtual decaf::lang::Appendable& doAppendCharSequence( const decaf::lang::CharSequence* csq );
virtual decaf::lang::Appendable& doAppendCharSequenceStartEnd( const decaf::lang::CharSequence* csq,
- int start, int end )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IndexOutOfBoundsException );
+ int start, int end );
};
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.cpp Fri Jul 2 19:04:44 2010
@@ -138,8 +138,7 @@ double Double::longBitsToDouble( long lo
}
////////////////////////////////////////////////////////////////////////////////
-double Double::parseDouble( const std::string value )
- throw ( exceptions::NumberFormatException ) {
+double Double::parseDouble( const std::string value ) {
// TODO - This is not going to parse the formats we say we do.
float result = 0.0;
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/lang/Double.h Fri Jul 2 19:04:44 2010
@@ -318,8 +318,7 @@ namespace lang{
* @returns a double parsed from the passed string
* @throws NumberFormatException
*/
- static double parseDouble( const std::string value )
- throw ( exceptions::NumberFormatException );
+ static double parseDouble( const std::string value );
/**
* Returns a hexadecimal string representation of the double argument. All
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.cpp Fri Jul 2 19:04:44 2010
@@ -44,8 +44,7 @@ ServerSocket::ServerSocket() : impl(NULL
}
////////////////////////////////////////////////////////////////////////////////
-ServerSocket::ServerSocket( int port )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException ) :
+ServerSocket::ServerSocket( int port ) :
impl(NULL), created(false), closed(false), bound(false) {
if( port < 0 ) {
@@ -59,8 +58,7 @@ ServerSocket::ServerSocket( int port )
}
////////////////////////////////////////////////////////////////////////////////
-ServerSocket::ServerSocket( int port, int backlog )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException ) :
+ServerSocket::ServerSocket( int port, int backlog ) :
impl(NULL), created(false), closed(false), bound(false) {
if( port < 0 ) {
@@ -74,8 +72,7 @@ ServerSocket::ServerSocket( int port, in
}
////////////////////////////////////////////////////////////////////////////////
-ServerSocket::ServerSocket( int port, int backlog, const InetAddress* ifAddress )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException ) :
+ServerSocket::ServerSocket( int port, int backlog, const InetAddress* ifAddress ) :
impl(NULL), created(false), closed(false), bound(false) {
if( port < 0 ) {
@@ -130,8 +127,7 @@ void ServerSocket::setupSocketImpl( int
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::bind( const std::string& host, int port )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException ) {
+void ServerSocket::bind( const std::string& host, int port ) {
try{
this->bind( host, port, getDefaultBacklog() );
@@ -142,8 +138,7 @@ void ServerSocket::bind( const std::stri
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::bind( const std::string& address, int port, int backlog )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException ) {
+void ServerSocket::bind( const std::string& address, int port, int backlog ) {
checkClosed();
@@ -177,7 +172,7 @@ void ServerSocket::bind( const std::stri
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::close() throw ( decaf::io::IOException ){
+void ServerSocket::close() {
try{
if( !this->closed ) {
@@ -201,7 +196,7 @@ bool ServerSocket::isClosed() const {
}
////////////////////////////////////////////////////////////////////////////////
-Socket* ServerSocket::accept() throw( decaf::io::IOException ) {
+Socket* ServerSocket::accept() {
checkClosed();
@@ -222,7 +217,7 @@ Socket* ServerSocket::accept() throw( de
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::implAccept( Socket* socket ) throw( decaf::io::IOException ) {
+void ServerSocket::implAccept( Socket* socket ) {
try{
this->impl->accept( socket->impl );
@@ -234,7 +229,7 @@ void ServerSocket::implAccept( Socket* s
}
////////////////////////////////////////////////////////////////////////////////
-int ServerSocket::getReceiveBufferSize() const throw( SocketException ) {
+int ServerSocket::getReceiveBufferSize() const {
checkClosed();
@@ -248,8 +243,7 @@ int ServerSocket::getReceiveBufferSize()
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::setReceiveBufferSize( int size )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException ) {
+void ServerSocket::setReceiveBufferSize( int size ) {
checkClosed();
@@ -269,7 +263,7 @@ void ServerSocket::setReceiveBufferSize(
}
////////////////////////////////////////////////////////////////////////////////
-bool ServerSocket::getReuseAddress() const throw( SocketException ) {
+bool ServerSocket::getReuseAddress() const {
checkClosed();
@@ -283,7 +277,7 @@ bool ServerSocket::getReuseAddress() con
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::setReuseAddress( bool reuse ) throw( SocketException ) {
+void ServerSocket::setReuseAddress( bool reuse ) {
checkClosed();
@@ -297,7 +291,7 @@ void ServerSocket::setReuseAddress( bool
}
////////////////////////////////////////////////////////////////////////////////
-int ServerSocket::getSoTimeout() const throw( SocketException ) {
+int ServerSocket::getSoTimeout() const {
checkClosed();
@@ -311,8 +305,7 @@ int ServerSocket::getSoTimeout() const t
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::setSoTimeout( int timeout )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException ) {
+void ServerSocket::setSoTimeout( int timeout ) {
checkClosed();
@@ -342,9 +335,7 @@ int ServerSocket::getLocalPort() const {
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::setSocketImplFactory( SocketImplFactory* factory )
- throw( decaf::io::IOException,
- decaf::net::SocketException ) {
+void ServerSocket::setSocketImplFactory( SocketImplFactory* factory ) {
if( Socket::factory != NULL ) {
throw SocketException(
@@ -371,14 +362,14 @@ std::string ServerSocket::toString() con
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::checkClosed() const throw( decaf::io::IOException ) {
+void ServerSocket::checkClosed() const {
if( this->closed ) {
throw IOException( __FILE__, __LINE__, "ServerSocket already closed." );
}
}
////////////////////////////////////////////////////////////////////////////////
-void ServerSocket::ensureCreated() const throw( decaf::io::IOException ) {
+void ServerSocket::ensureCreated() const {
try{
if( !this->created ) {
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/ServerSocket.h Fri Jul 2 19:04:44 2010
@@ -86,9 +86,7 @@ namespace net{
* @throws IOException if there is an I/O error while performing this operation.
* @throws IllegalArgumentException if the port value is negative or greater than 65535.
*/
- ServerSocket( int port )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException );
+ ServerSocket( int port );
/**
* Creates a new ServerSocket bound to the specified port, if the value of port is 0, then
@@ -109,9 +107,7 @@ namespace net{
* @throws IOException if there is an I/O error while performing this operation.
* @throws IllegalArgumentException if the port value is negative or greater than 65535.
*/
- ServerSocket( int port, int backlog )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException );
+ ServerSocket( int port, int backlog );
/**
* Creates a new ServerSocket bound to the specified port, if the value of port is 0, then
@@ -135,9 +131,7 @@ namespace net{
* @throws IOException if there is an I/O error while performing this operation.
* @throws IllegalArgumentException if the port value is negative or greater than 65535.
*/
- ServerSocket( int port, int backlog, const InetAddress* address )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException );
+ ServerSocket( int port, int backlog, const InetAddress* address );
/**
* Releases socket handle if close() hasn't been called.
@@ -173,8 +167,7 @@ namespace net{
* @throws IOException if an I/O error occurs while binding the socket.
* @throws IllegalArgumentException if the parameters are not valid.
*/
- virtual void bind( const std::string& host, int port )
- throw ( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void bind( const std::string& host, int port );
/**
* Bind and listen to given local IPAddress and port, if the address is empty
@@ -194,8 +187,7 @@ namespace net{
* @throws IOException if an I/O error occurs while binding the socket.
* @throws IllegalArgumentException if the parameters are not valid.
*/
- virtual void bind( const std::string& host, int port, int backlog )
- throw ( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void bind( const std::string& host, int port, int backlog );
/**
* Listens for a connection request on the bound IPAddress and Port for this ServerSocket, the
@@ -209,7 +201,7 @@ namespace net{
* @throws SocketException if an error occurs while blocking on the accept call.
* @throws SocketTimeoutException if the SO_TIMEOUT option was used and the accept timed out.
*/
- virtual Socket* accept() throw( decaf::io::IOException );
+ virtual Socket* accept();
/**
* Closes the server socket, causing any Threads blocked on an accept call to
@@ -217,7 +209,7 @@ namespace net{
*
* @throws IOException if an I/O error occurs while performing this operation.
*/
- virtual void close() throw( decaf::io::IOException );
+ virtual void close();
/**
* @returns true if the close method has been called on the ServerSocket.
@@ -237,7 +229,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual int getReceiveBufferSize() const throw( SocketException );
+ virtual int getReceiveBufferSize() const;
/**
* Sets the receive buffer size for this socket, SO_RCVBUF.
@@ -248,8 +240,7 @@ namespace net{
* @throws SocketException if the operation fails.
* @throws IllegalArgumentException if the value is zero or negative.
*/
- virtual void setReceiveBufferSize( int size )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setReceiveBufferSize( int size );
/**
* Gets the reuse address flag, SO_REUSEADDR.
@@ -258,7 +249,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual bool getReuseAddress() const throw( SocketException );
+ virtual bool getReuseAddress() const;
/**
* Sets the reuse address flag, SO_REUSEADDR.
@@ -268,7 +259,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual void setReuseAddress( bool reuse ) throw( SocketException );
+ virtual void setReuseAddress( bool reuse );
/**
* Gets the timeout for socket operations, SO_TIMEOUT.
@@ -277,7 +268,7 @@ namespace net{
*
* @throws SocketException Thrown if unable to retrieve the information.
*/
- virtual int getSoTimeout() const throw( SocketException );
+ virtual int getSoTimeout() const;
/**
* Sets the timeout for socket operations, SO_TIMEOUT. A value of zero indicates that timeout
@@ -289,8 +280,7 @@ namespace net{
* @throws SocketException Thrown if unable to set the information.
* @throws IllegalArgumentException if the timeout value is negative.
*/
- virtual void setSoTimeout( int timeout )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setSoTimeout( int timeout );
/**
* Gets the port number on the Local machine that this ServerSocket is bound to.
@@ -317,9 +307,7 @@ namespace net{
* @throws IOException if an I/O error occurs while performing this operation.
* @throws SocketException if this method has already been called with a valid factory.
*/
- static void setSocketImplFactory( SocketImplFactory* factory )
- throw( decaf::io::IOException,
- decaf::net::SocketException );
+ static void setSocketImplFactory( SocketImplFactory* factory );
protected:
@@ -332,8 +320,7 @@ namespace net{
*
* @throws IOException if an I/O error occurs while performing this operation.
*/
- virtual void implAccept( Socket* socket )
- throw( decaf::io::IOException );
+ virtual void implAccept( Socket* socket );
/**
* Allows a subclass to override what is considered the default backlog.
@@ -345,10 +332,10 @@ namespace net{
protected:
// Check for already closed and throw an error if so.
- void checkClosed() const throw( decaf::io::IOException );
+ void checkClosed() const;
// Create but don't connect the underlying OS Socket instance, if not already created.
- void ensureCreated() const throw( decaf::io::IOException );
+ void ensureCreated() const;
// Binds and sets up the Listen for this Server Socket
void setupSocketImpl( int port, int backlog, const InetAddress* ifAddress );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.cpp Fri Jul 2 19:04:44 2010
@@ -181,8 +181,7 @@ Socket::~Socket() {
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::initSocketImpl( const std::string& host, int port, const InetAddress* localAddress, int localPort )
- throw( decaf::io::IOException, decaf::net::UnknownHostException ) {
+void Socket::initSocketImpl( const std::string& host, int port, const InetAddress* localAddress, int localPort ) {
try{
@@ -233,8 +232,7 @@ std::string Socket::getLocalAddress() co
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::bind( const std::string& ipaddress, int port )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::bind( const std::string& ipaddress, int port ) {
checkClosed();
@@ -262,7 +260,7 @@ void Socket::bind( const std::string& ip
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::close() throw( decaf::io::IOException ) {
+void Socket::close() {
try{
this->closed = true;
this->impl->close();
@@ -272,9 +270,7 @@ void Socket::close() throw( decaf::io::I
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::connect( const std::string& host, int port )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::connect( const std::string& host, int port ) {
if( port < 0 || port > 65535 ) {
throw IllegalArgumentException(
@@ -290,9 +286,7 @@ void Socket::connect( const std::string&
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::connect( const std::string& host, int port, int timeout )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::connect( const std::string& host, int port, int timeout ) {
checkClosed();
@@ -337,7 +331,7 @@ void Socket::connect( const std::string&
}
////////////////////////////////////////////////////////////////////////////////
-InputStream* Socket::getInputStream() throw( decaf::io::IOException ) {
+InputStream* Socket::getInputStream() {
checkClosed();
@@ -355,7 +349,7 @@ InputStream* Socket::getInputStream() th
}
////////////////////////////////////////////////////////////////////////////////
-OutputStream* Socket::getOutputStream() throw( decaf::io::IOException ) {
+OutputStream* Socket::getOutputStream() {
checkClosed();
@@ -373,7 +367,7 @@ OutputStream* Socket::getOutputStream()
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::shutdownInput() throw( decaf::io::IOException ) {
+void Socket::shutdownInput() {
if( isInputShutdown() ) {
throw IOException( __FILE__, __LINE__, "Socket input has already been shutdown." );
@@ -391,7 +385,7 @@ void Socket::shutdownInput() throw( deca
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::shutdownOutput() throw( decaf::io::IOException ) {
+void Socket::shutdownOutput() {
if( isOutputShutdown() ) {
throw IOException( __FILE__, __LINE__, "Socket output has already been shutdown." );
@@ -409,7 +403,7 @@ void Socket::shutdownOutput() throw( dec
}
////////////////////////////////////////////////////////////////////////////////
-int Socket::getSoLinger() const throw( SocketException ) {
+int Socket::getSoLinger() const {
checkClosed();
@@ -423,8 +417,7 @@ int Socket::getSoLinger() const throw( S
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setSoLinger( bool state, int timeout )
- throw( SocketException, IllegalArgumentException ) {
+void Socket::setSoLinger( bool state, int timeout ) {
checkClosed();
@@ -446,7 +439,7 @@ void Socket::setSoLinger( bool state, in
}
////////////////////////////////////////////////////////////////////////////////
-bool Socket::getKeepAlive() const throw( SocketException ) {
+bool Socket::getKeepAlive() const {
checkClosed();
@@ -460,7 +453,7 @@ bool Socket::getKeepAlive() const throw(
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setKeepAlive( bool keepAlive ) throw( SocketException ) {
+void Socket::setKeepAlive( bool keepAlive ) {
checkClosed();
@@ -474,7 +467,7 @@ void Socket::setKeepAlive( bool keepAliv
}
////////////////////////////////////////////////////////////////////////////////
-int Socket::getReceiveBufferSize() const throw( SocketException ) {
+int Socket::getReceiveBufferSize() const {
checkClosed();
@@ -488,8 +481,7 @@ int Socket::getReceiveBufferSize() const
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setReceiveBufferSize( int size )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::setReceiveBufferSize( int size ) {
checkClosed();
@@ -509,7 +501,7 @@ void Socket::setReceiveBufferSize( int s
}
////////////////////////////////////////////////////////////////////////////////
-bool Socket::getReuseAddress() const throw( SocketException ) {
+bool Socket::getReuseAddress() const {
checkClosed();
@@ -523,7 +515,7 @@ bool Socket::getReuseAddress() const thr
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setReuseAddress( bool reuse ) throw( SocketException ) {
+void Socket::setReuseAddress( bool reuse ) {
checkClosed();
@@ -537,7 +529,7 @@ void Socket::setReuseAddress( bool reuse
}
////////////////////////////////////////////////////////////////////////////////
-int Socket::getSendBufferSize() const throw( SocketException ) {
+int Socket::getSendBufferSize() const {
checkClosed();
@@ -551,8 +543,7 @@ int Socket::getSendBufferSize() const th
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setSendBufferSize( int size )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::setSendBufferSize( int size ) {
checkClosed();
@@ -572,7 +563,7 @@ void Socket::setSendBufferSize( int size
}
////////////////////////////////////////////////////////////////////////////////
-int Socket::getSoTimeout() const throw( SocketException ) {
+int Socket::getSoTimeout() const {
checkClosed();
@@ -586,8 +577,7 @@ int Socket::getSoTimeout() const throw(
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setSoTimeout( int timeout )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::setSoTimeout( int timeout ) {
checkClosed();
@@ -607,7 +597,7 @@ void Socket::setSoTimeout( int timeout )
}
////////////////////////////////////////////////////////////////////////////////
-bool Socket::getTcpNoDelay() const throw ( SocketException ) {
+bool Socket::getTcpNoDelay() const {
checkClosed();
@@ -621,7 +611,7 @@ bool Socket::getTcpNoDelay() const throw
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setTcpNoDelay( bool value ) throw ( SocketException ) {
+void Socket::setTcpNoDelay( bool value ) {
checkClosed();
@@ -635,7 +625,7 @@ void Socket::setTcpNoDelay( bool value )
}
////////////////////////////////////////////////////////////////////////////////
-int Socket::getTrafficClass() const throw( SocketException ) {
+int Socket::getTrafficClass() const {
checkClosed();
@@ -649,8 +639,7 @@ int Socket::getTrafficClass() const thro
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setTrafficClass( int value )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException ) {
+void Socket::setTrafficClass( int value ) {
checkClosed();
@@ -670,7 +659,7 @@ void Socket::setTrafficClass( int value
}
////////////////////////////////////////////////////////////////////////////////
-bool Socket::getOOBInline() const throw( SocketException ) {
+bool Socket::getOOBInline() const {
checkClosed();
@@ -684,7 +673,7 @@ bool Socket::getOOBInline() const throw(
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setOOBInline( bool value ) throw( SocketException ) {
+void Socket::setOOBInline( bool value ) {
checkClosed();
@@ -698,7 +687,7 @@ void Socket::setOOBInline( bool value )
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::sendUrgentData( int data ) throw( decaf::io::IOException ) {
+void Socket::sendUrgentData( int data ) {
checkClosed();
@@ -712,14 +701,14 @@ void Socket::sendUrgentData( int data )
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::checkClosed() const throw( decaf::io::IOException ) {
+void Socket::checkClosed() const {
if( this->closed ) {
throw IOException( __FILE__, __LINE__, "Socket already closed." );
}
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::ensureCreated() const throw( decaf::io::IOException ) {
+void Socket::ensureCreated() const {
try{
if( !this->created ) {
@@ -733,9 +722,7 @@ void Socket::ensureCreated() const throw
}
////////////////////////////////////////////////////////////////////////////////
-void Socket::setSocketImplFactory( SocketImplFactory* factory )
- throw( decaf::io::IOException,
- decaf::net::SocketException ) {
+void Socket::setSocketImplFactory( SocketImplFactory* factory ) {
if( Socket::factory != NULL ) {
throw SocketException(
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/Socket.h Fri Jul 2 19:04:44 2010
@@ -179,8 +179,7 @@ namespace net{
* @throws IllegalArgumentException if the Socket can't process the subclass of SocketAddress
* that has been provided.
*/
- virtual void bind( const std::string& ipaddress, int port )
- throw( decaf::io::IOException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void bind( const std::string& ipaddress, int port );
/**
* Closes the Socket. Once closed a Socket cannot be connected or otherwise
@@ -188,7 +187,7 @@ namespace net{
*
* @throws IOException if an I/O error occurs while closing the Socket.
*/
- virtual void close() throw( decaf::io::IOException );
+ virtual void close();
/**
* Connects to the specified destination.
@@ -201,9 +200,7 @@ namespace net{
* @throws IOException Thrown if a failure occurred in the connect.
* @throws IllegalArguementException if the timeout value is negative or the endpoint is invalid.
*/
- virtual void connect( const std::string& host, int port )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException );
+ virtual void connect( const std::string& host, int port );
/**
* Connects to the specified destination, with a specified timeout value. If a connection
@@ -222,9 +219,7 @@ namespace net{
* @throws SocketTimeoutException if the timeout for connection is exceeded.
* @throws IllegalArguementException if the timeout value is negative or the endpoint is invalid.
*/
- virtual void connect( const std::string& host, int port, int timeout )
- throw( decaf::io::IOException,
- decaf::lang::exceptions::IllegalArgumentException );
+ virtual void connect( const std::string& host, int port, int timeout );
/**
* Indicates whether or not this socket is connected to am end point.
@@ -278,7 +273,7 @@ namespace net{
* @throws IOException if an error occurs during creation of the InputStream, also if the
* Socket is not connected or the input has been shutdown previously.
*/
- virtual decaf::io::InputStream* getInputStream() throw( decaf::io::IOException );
+ virtual decaf::io::InputStream* getInputStream();
/**
* Gets the OutputStream for this socket if it is connected. The pointer returned is the
@@ -291,7 +286,7 @@ namespace net{
* @throws IOException if an error occurs during the creation of this OutputStream, or
* if the Socket is closed or the output has been shutdown previously.
*/
- virtual decaf::io::OutputStream* getOutputStream() throw( decaf::io::IOException );
+ virtual decaf::io::OutputStream* getOutputStream();
/**
* Gets the on the remote host this Socket is connected to.
@@ -327,7 +322,7 @@ namespace net{
*
* @throws IOException if an I/O error occurs while performing this operation.
*/
- virtual void shutdownInput() throw( decaf::io::IOException );
+ virtual void shutdownInput();
/**
* Shuts down the OutputStream for this socket, any data already written to the socket will
@@ -335,7 +330,7 @@ namespace net{
*
* @throws IOException if an I/O error occurs while performing this operation.
*/
- virtual void shutdownOutput() throw( decaf::io::IOException );
+ virtual void shutdownOutput();
/**
* Gets the linger time for the socket, SO_LINGER. A return value of -1 indicates that
@@ -345,7 +340,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual int getSoLinger() const throw( SocketException );
+ virtual int getSoLinger() const;
/**
* Sets the linger time (SO_LINGER) using a specified time value, this limits of this
@@ -359,8 +354,7 @@ namespace net{
* @throws SocketException if the operation fails.
* @throws IllegalArgumentException if state is true and timeout is negative.
*/
- virtual void setSoLinger( bool state, int timeout )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setSoLinger( bool state, int timeout );
/**
* Gets the keep alive flag for this socket, SO_KEEPALIVE.
@@ -369,7 +363,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual bool getKeepAlive() const throw( SocketException );
+ virtual bool getKeepAlive() const;
/**
* Enables/disables the keep alive flag for this socket, SO_KEEPALIVE.
@@ -379,7 +373,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual void setKeepAlive( bool keepAlive ) throw( SocketException );
+ virtual void setKeepAlive( bool keepAlive );
/**
* Gets the receive buffer size for this socket, SO_RCVBUF. This is the buffer used
@@ -389,7 +383,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual int getReceiveBufferSize() const throw( SocketException );
+ virtual int getReceiveBufferSize() const;
/**
* Sets the receive buffer size for this socket, SO_RCVBUF.
@@ -400,8 +394,7 @@ namespace net{
* @throws SocketException if the operation fails.
* @throws IllegalArgumentException if the value is zero or negative.
*/
- virtual void setReceiveBufferSize( int size )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setReceiveBufferSize( int size );
/**
* Gets the reuse address flag, SO_REUSEADDR.
@@ -410,7 +403,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual bool getReuseAddress() const throw( SocketException );
+ virtual bool getReuseAddress() const;
/**
* Sets the reuse address flag, SO_REUSEADDR.
@@ -420,7 +413,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual void setReuseAddress( bool reuse ) throw( SocketException );
+ virtual void setReuseAddress( bool reuse );
/**
* Gets the send buffer size for this socket, SO_SNDBUF, this value is used by the platform
@@ -430,7 +423,7 @@ namespace net{
*
* @throws SocketException if the operation fails.
*/
- virtual int getSendBufferSize() const throw( SocketException );
+ virtual int getSendBufferSize() const;
/**
* Gets the send buffer size for this socket, SO_SNDBUF, this value is used by the platform
@@ -442,8 +435,7 @@ namespace net{
* @throws SocketException if the operation fails.
* @throws IllegalArgumentException if the value is zero or negative.
*/
- virtual void setSendBufferSize( int size )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setSendBufferSize( int size );
/**
* Gets the timeout for socket operations, SO_TIMEOUT.
@@ -452,7 +444,7 @@ namespace net{
*
* @throws SocketException Thrown if unable to retrieve the information.
*/
- virtual int getSoTimeout() const throw( SocketException );
+ virtual int getSoTimeout() const;
/**
* Sets the timeout for socket operations, SO_TIMEOUT. A value of zero indicates that timeout
@@ -464,8 +456,7 @@ namespace net{
* @throws SocketException Thrown if unable to set the information.
* @throws IllegalArgumentException if the timeout value is negative.
*/
- virtual void setSoTimeout( int timeout )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setSoTimeout( int timeout );
/**
* Gets the Status of the TCP_NODELAY setting for this socket.
@@ -474,7 +465,7 @@ namespace net{
*
* @throws SocketException Thrown if unable to set the information.
*/
- virtual bool getTcpNoDelay() const throw ( SocketException );
+ virtual bool getTcpNoDelay() const;
/**
* Sets the Status of the TCP_NODELAY param for this socket., this setting is used
@@ -485,7 +476,7 @@ namespace net{
*
* @throws SocketException Thrown if unable to set the information.
*/
- virtual void setTcpNoDelay( bool value ) throw ( SocketException );
+ virtual void setTcpNoDelay( bool value );
/**
* Gets the Traffic Class setting for this Socket, sometimes referred to as Type of
@@ -498,7 +489,7 @@ namespace net{
*
* @throws SocketException if an error is encountered while performing this operation.
*/
- virtual int getTrafficClass() const throw( SocketException );
+ virtual int getTrafficClass() const;
/**
* Gets the Traffic Class setting for this Socket, sometimes referred to as Type of
@@ -513,8 +504,7 @@ namespace net{
* @throws SocketException if an error is encountered while performing this operation.
* @throws IllegalArgumentException if the value is not in the range [0..255].
*/
- virtual void setTrafficClass( int value )
- throw( SocketException, decaf::lang::exceptions::IllegalArgumentException );
+ virtual void setTrafficClass( int value );
/**
* Gets the value of the OOBINLINE for this socket.
@@ -523,7 +513,7 @@ namespace net{
*
* @throws SocketException if an error is encountered while performing this operation.
*/
- virtual bool getOOBInline() const throw( SocketException );
+ virtual bool getOOBInline() const;
/**
* Sets the value of the OOBINLINE for this socket, by default this option is disabled. If
@@ -533,7 +523,7 @@ namespace net{
*
* @throws SocketException if an error is encountered while performing this operation.
*/
- virtual void setOOBInline( bool value ) throw( SocketException );
+ virtual void setOOBInline( bool value );
/**
* Sends on byte of urgent data to the Socket.
@@ -543,7 +533,7 @@ namespace net{
*
* @throws IOException if an I/O error occurs while performing this operation.
*/
- virtual void sendUrgentData( int data ) throw( decaf::io::IOException );
+ virtual void sendUrgentData( int data );
/**
* @returns a string representing this Socket.
@@ -563,9 +553,7 @@ namespace net{
* @throws IOException if an I/O error occurs while performing this operation.
* @throws SocketException if this method has already been called with a valid factory.
*/
- static void setSocketImplFactory( SocketImplFactory* factory )
- throw( decaf::io::IOException,
- decaf::net::SocketException );
+ static void setSocketImplFactory( SocketImplFactory* factory );
protected:
@@ -574,14 +562,13 @@ namespace net{
void accepted();
// Sets up a connected socket for the constructors that take connection arguments.
- void initSocketImpl( const std::string& address, int port, const InetAddress* localAddress, int localPort )
- throw( decaf::io::IOException, decaf::net::UnknownHostException );
+ void initSocketImpl( const std::string& address, int port, const InetAddress* localAddress, int localPort );
// Check for already closed and throw an error if so.
- void checkClosed() const throw( decaf::io::IOException );
+ void checkClosed() const;
// Create but don't connect the underlying OS Socket instance, if not already created.
- void ensureCreated() const throw( decaf::io::IOException );
+ void ensureCreated() const;
};
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.cpp Fri Jul 2 19:04:44 2010
@@ -38,7 +38,7 @@ SocketFactory::~SocketFactory() {
}
////////////////////////////////////////////////////////////////////////////////
-Socket* SocketFactory::createSocket() throw( decaf::io::IOException ) {
+Socket* SocketFactory::createSocket() {
throw IOException(
__FILE__, __LINE__, "Unconnected Sockets not implemented for this Socket Type." );
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketFactory.h Fri Jul 2 19:04:44 2010
@@ -56,7 +56,7 @@ namespace net{
*
* @throws IOException if the Socket cannot be created.
*/
- virtual Socket* createSocket() throw( decaf::io::IOException );
+ virtual Socket* createSocket();
/**
* Creates a new Socket object and connects it to the specified remote host and
@@ -72,8 +72,7 @@ namespace net{
* @throws IOException if an I/O error occurs while creating the Socket object.
* @throws UnknownHostException if the host name is not known.
*/
- virtual Socket* createSocket( const InetAddress* host, int port )
- throw( decaf::io::IOException, decaf::net::UnknownHostException ) = 0;
+ virtual Socket* createSocket( const InetAddress* host, int port ) = 0;
/**
* Creates a new Socket object and connects it to the specified remote host and
@@ -95,8 +94,7 @@ namespace net{
* @throws UnknownHostException if the host name is not known.
*/
virtual Socket* createSocket( const InetAddress* host, int port,
- const InetAddress* ifAddress, int localPort )
- throw( decaf::io::IOException, decaf::net::UnknownHostException ) = 0;
+ const InetAddress* ifAddress, int localPort ) = 0;
/**
* Creates a new Socket object and connects it to the specified remote host and
@@ -112,8 +110,7 @@ namespace net{
* @throws IOException if an I/O error occurs while creating the Socket object.
* @throws UnknownHostException if the host name is not known.
*/
- virtual Socket* createSocket( const std::string& name, int port )
- throw( decaf::io::IOException, decaf::net::UnknownHostException ) = 0;
+ virtual Socket* createSocket( const std::string& name, int port ) = 0;
/**
* Creates a new Socket object and connects it to the specified remote host and
@@ -134,8 +131,7 @@ namespace net{
* @throws UnknownHostException if the host name is not known.
*/
virtual Socket* createSocket( const std::string& name, int port,
- const InetAddress* ifAddress, int localPort )
- throw( decaf::io::IOException, decaf::net::UnknownHostException ) = 0;
+ const InetAddress* ifAddress, int localPort ) = 0;
/**
* Returns an pointer to the default SocketFactory for this Application, there is only one
Modified: activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.cpp?rev=960088&r1=960087&r2=960088&view=diff
==============================================================================
--- activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.cpp (original)
+++ activemq/activemq-cpp/trunk/activemq-cpp/src/main/decaf/net/SocketImpl.cpp Fri Jul 2 19:04:44 2010
@@ -41,7 +41,7 @@ std::string SocketImpl::toString() const
}
////////////////////////////////////////////////////////////////////////////////
-void SocketImpl::sendUrgentData( int data DECAF_UNUSED ) throw( decaf::io::IOException ) {
+void SocketImpl::sendUrgentData( int data DECAF_UNUSED ) {
throw decaf::io::IOException(
__FILE__, __LINE__, "Urgent Data not supported by this implementation." );