ChangeLogTag: Fri Oct 14 14:11:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 28 insertions, 19 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index dc73522f0ef..362de4e6689 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,20 +1,25 @@
+Fri Oct 14 14:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tools/Config_Handlers/DynAny_Handler/DynAny_Handler.cpp:
+          Removed not needed ;
+
 Thu Oct 13 15:42:12 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
        * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
 
-       Various compile fixes for Borland. 
-       
+       Various compile fixes for Borland.
+
        * tools/Config_Handlers/XMLSchema/Types.hpp
-       
-       Modified to use ACE typedefs for number types. 
-       
+
+       Modified to use ACE typedefs for number types.
+
        * tools/Config_Handlers/XSCRT/Elements.hpp
-       
+
        Removed unneeded non-const conversion operator which was causing
        errors in Borland.
-       
+
 Wed Oct 12 14:13:09 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 	* examples/Hello/Sender/Sender.idl
@@ -27,16 +32,16 @@ Wed Oct 12 14:13:09 2005  William Otte  <wotte@dre.vanderbilt.edu>
 Wed Oct 12 15:08:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * tools/Config_Handlers/RT-CCM/TP_Handler.cpp:
-        
-          Changed the types of some static_casts on the rhs of 
+
+          Changed the types of some static_casts on the rhs of
           assignments to match the types on the lhs, eliminating
           warnings from MSVC 7.1.
 
 Wed Oct 12 13:17:58 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * CIDLC/TypeNameEmitter.cpp:
-        
-          Removed generation of error message with code that attempts 
+
+          Removed generation of error message with code that attempts
           to set an enum attribute value, and replace it with code
           that extracts the enum value from the Any arguement.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
index 23183151175..4139898c4ce 100755
--- a/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Basic/run_test.pl
@@ -79,7 +79,11 @@ $Naming = new PerlACE::Process ("../../../Naming_Service/Naming_Service",
                                 "-o $namingior");
 unlink $namingior;
 
-$Naming->Spawn ();
+$naming_spawn = $Naming->Spawn ();
+if ($naming_spawn != 0) 
+  {
+    exit 1;
+  }
 
 if (PerlACE::waitforfile_timed ($namingior, $startup_timeout) == -1) {
   print STDERR "ERROR: waiting for the naming service to start\n";
diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
index 7993f7620f8..93dedffa878 100644
--- a/ace/SSL/SSL_Asynch_BIO.cpp
+++ b/ace/SSL/SSL_Asynch_BIO.cpp
@@ -75,7 +75,7 @@ ACE_Asynch_BIO_free (BIO *pBIO)
 }
 
 int
-ACE_Asynch_BIO_read (BIO * pBIO, char * buf, size_t len)
+ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len)
 {
   BIO_clear_retry_flags (pBIO);
 
@@ -110,7 +110,7 @@ ACE_Asynch_BIO_read (BIO * pBIO, char * buf, size_t len)
 }
 
 int
-ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, size_t len)
+ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len)
 {
   BIO_clear_retry_flags (pBIO);
 
@@ -123,7 +123,7 @@ ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, size_t len)
   if (buf == 0)
     return -1;
 
-  if (len == 0)
+  if (len <= 0)
     return -1;
 
   BIO_clear_retry_flags (pBIO);
diff --git a/ace/SSL/SSL_Asynch_BIO.h b/ace/SSL/SSL_Asynch_BIO.h
index 1483b6d3c45..d6cf4e571e4 100644
--- a/ace/SSL/SSL_Asynch_BIO.h
+++ b/ace/SSL/SSL_Asynch_BIO.h
@@ -34,8 +34,8 @@
 //@{
 extern "C"
 {
-  int  ACE_Asynch_BIO_write (BIO *pBIO, const char *buf, size_t len);
-  int  ACE_Asynch_BIO_read  (BIO *pBIO, char *buf, size_t len);
+  int  ACE_Asynch_BIO_write (BIO *pBIO, const char *buf, int len);
+  int  ACE_Asynch_BIO_read  (BIO *pBIO, char *buf, int len);
   int  ACE_Asynch_BIO_puts  (BIO *pBIO, const char *str);
   long ACE_Asynch_BIO_ctrl  (BIO *pBIO, int cmd, long arg1, void *arg2);
   int  ACE_Asynch_BIO_new   (BIO *pBIO);
diff --git a/ace/SSL/SSL_Asynch_Stream.h b/ace/SSL/SSL_Asynch_Stream.h
index e8d2b8f8c34..d1ad0f811a8 100644
--- a/ace/SSL/SSL_Asynch_Stream.h
+++ b/ace/SSL/SSL_Asynch_Stream.h
@@ -60,8 +60,8 @@ class ACE_SSL_Export ACE_SSL_Asynch_Stream
   : public ACE_Asynch_Operation,
     public ACE_Service_Handler
 {
-  friend int ACE_Asynch_BIO_read (BIO * pBIO, char * buf, int len);
-  friend int ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, int len);
+  friend int ACE_Asynch_BIO_read (BIO * pBIO, char * buf, size_t len);
+  friend int ACE_Asynch_BIO_write (BIO * pBIO, const char * buf, size_t len);
 
 public: