svn commit: r601469 - in /activemq/activemq-cpp/tags/activemq-cpp-2.1.3: configure.ac src/main/activemq/network/SocketInputStream.cpp src/main/activemq/network/TcpSocket.cpp

[ta...@apache.org]

Author: tabish
Date: Wed Dec  5 10:58:30 2007
New Revision: 601469

URL: http://svn.apache.org/viewvc?rev=601469&view=rev
Log:
Creating new tag for a 2.1.3 release
http://issues.apache.org/activemq/browse/AMQCPP-154

Modified:
    activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac
    activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp
    activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac?rev=601469&r1=601468&r2=601469&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.3/configure.ac Wed Dec  5 10:58:30 2007
@@ -79,6 +79,7 @@
 AC_CHECK_HEADERS([uuid.h uuid/uuid.h], [AC_DEFINE([HAVE_UUID_T], [1], [Define if uuid_t exists.])])
 AC_CHECK_HEADERS([objbase.h])
 AC_CHECK_HEADERS([repcdce.h])
+AC_CHECK_HEADERS([stropts.h])
 AC_CHECK_HEADERS([sys/filio.h])
 AC_CHECK_HEADERS([sys/ioctl.h])
 AC_CHECK_HEADERS([sys/select.h])
@@ -116,8 +117,8 @@
     else
        # Assuming Sun Compiler and adding in optimization
        # because autoconf can't seem to figure it out.
-       PLAT_CXXFLAGS="-mt -w -O5"
-       PLAT_LIBS+="-library=stlport4"
+       PLAT_CXXFLAGS="-library=stlport4 -mt -w -O5"
+       PLAT_LIBS="$PLAT_LIBS -library=stlport4"
     fi
     ;;
 

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp?rev=601469&r1=601468&r2=601469&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/SocketInputStream.cpp Wed Dec  5 10:58:30 2007
@@ -32,7 +32,9 @@
 // Pick up FIONREAD on Solaris 2.5.
 #ifdef HAVE_SYS_FILIO_H
 #include <unistd.h>
-#include <stropts.h>
+    #ifdef HAVE_STROPTS_H
+    #include <stropts.h>
+    #endif
 #include <sys/filio.h>
 #endif
 

Modified: activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp
URL: http://svn.apache.org/viewvc/activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp?rev=601469&r1=601468&r2=601469&view=diff
==============================================================================
--- activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp (original)
+++ activemq/activemq-cpp/tags/activemq-cpp-2.1.3/src/main/activemq/network/TcpSocket.cpp Wed Dec  5 10:58:30 2007
@@ -189,7 +189,12 @@
 
         checkResult( ::getaddrinfo( host, NULL, &hints, &res_ptr ) );
 
-        assert(res_ptr->ai_addr->sa_family == AF_INET);
+        if( res_ptr == NULL || res_ptr->ai_addr->sa_family != AF_INET ){
+            throw SocketException(
+                __FILE__, __LINE__,
+                "TcpSocket::connect - getaddrinfo failed, is hostname correct?" );
+        }
+
         // Porting: On both 32bit and 64 bit systems that we compile to soo far, sin_addr
         // is a 32 bit value, not an unsigned long.
         assert( sizeof( ( ( sockaddr_in* )res_ptr->ai_addr )->sin_addr.s_addr ) == 4 );