synch with James

2 files changed, 14 insertions, 12 deletions

diff --git a/examples/IOStream/client/iostream_client.cpp b/examples/IOStream/client/iostream_client.cpp
index b18dd87c550..7ad9245bb26 100644
--- a/examples/IOStream/client/iostream_client.cpp
+++ b/examples/IOStream/client/iostream_client.cpp
@@ -12,16 +12,15 @@ int main (int argc, char *argv[])
 
   if (connector.connect (server, addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  
-  server << "1 2.3 testing" << endl;	// Command the server to execute function 'foo'
-  server.sync ();			// Force the data to the server.
+
+  server << "1 2.3 testing" << endl;	// Buffer up some things to send to the server.
 
   int i;
   float f;
 
 #if defined (__GNUC__)
   String s1;
-  QuotedString s2;
+  String s2;
   server >> s1 >> i >> f >> s2;
 
   cerr << "Server said:\n\t";
@@ -30,9 +29,11 @@ int main (int argc, char *argv[])
   cerr << f << " ";
   cerr << s2 << endl;
 #else
-  server >> i >> f;
+  String s1;
+  server s1 >> i >> f;
 
   cerr << "Server said:\n\t";
+  cerr << s1 << " ";
   cerr << i << " ";
   cerr << f << endl;
 #endif /* __GNUC__ */
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index c4cd945e044..8aab10de103 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -62,17 +62,18 @@ public:
 		
     if (!(this -> peer () >> i >> f >> s))
       {
-	cerr << "Error getting data" << endl ;
-	return - 1 ;
+	cerr << "Server: Error getting data" << endl ;
+        return - 1 ;
       }
 
-    cerr << "Received (" << i << ") (" << f << ") (" << s << ")" << endl ;
+    cerr << "Server Received: (" << i << ") (" << f << ") (" << s << ")" << endl ;
 
-    if (!(this -> peer () << "Received (" << i << ") (" << f << ") (" << s << ")" << endl))
+    if (!(this -> peer () << "Received: " << i << " " << f << " " << s << endl))
       {
 	cerr << __LINE__ << "Error sending data" << endl ;
 	return - 1 ;
       }
+
 #else
     if (!(this -> peer () >> i >> f))
       {
@@ -82,7 +83,7 @@ public:
 
     cerr << "Received (" << i << ") (" << f << ")" << endl;
 
-    if (!(this -> peer () << "Received (" << i << ") (" << f << ")" << endl))
+    if (!(this -> peer () << i << " " << f << endl))
       {
 	cerr << __LINE__ << "Error sending data" << endl ;
 	return - 1 ;
@@ -92,7 +93,7 @@ public:
     // sync () function.  Some iostreams implementations let us use a
     // 'flush' function much like the 'endl' function.
 
-    this->peer ().sync ();
+    // this->peer ().sync ();
     return 0;
   }
 };
@@ -121,7 +122,7 @@ main (int argc, char *argv [])
 
   Logging_Acceptor peer_acceptor ;
 	
-  if (peer_acceptor.open (ACE_INET_Addr (argc > 1 ? atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT)) == - 1) 
+  if (peer_acceptor.open (ACE_INET_Addr (argc > 1 ? atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT)) == - 1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), - 1);
 
   else if (ACE_Service_Config::reactor ()->register_handler