ChangeLogTag: Thu Jun 18 15:44:35 UTC 2009 Adam Mitz <mitza@ociweb.com>

6 files changed, 20 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1552ee1f93a..796c242b014 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Thu Jun 18 15:44:35 UTC 2009  Adam Mitz  <mitza@ociweb.com>
+
+        * tao/Block_Flushing_Strategy.h:
+        * tao/Block_Flushing_Strategy.cpp:
+        * tao/Flushing_Strategy.h:
+        * tao/Flushing_Strategy.cpp:
+        * tao/Transport.cpp:
+
+          Reverted the change from...
+          Fri Jun 12 14:29:55 UTC 2009  Adam Mitz  <mitza@ociweb.com>
+          ...which made it an error to have a send() return -1/EWOULDBLOCK
+          with the blocking flushing strategy.  This is actually expected
+          behavior for a server, but it needs to be changed for the blocking
+          flusing strategy, see bug #3704, to be resolved after the release.
+
 Tue Jun 16 20:23:44 UTC 2009  Adam Mitz  <mitza@ociweb.com>
 
         * bin/tao_orb_tests.lst:
@@ -7,13 +22,13 @@ Tue Jun 16 20:23:44 UTC 2009  Adam Mitz  <mitza@ociweb.com>
 Tue Jun 16 15:33:24 UTC 2009  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * NEWS:
-        
-          Updated. 
-        
+
+          Updated.
+
         * TAO_IDL/contrib/mcpp/system.cpp:
 
-          Removed incompatible throw specification. 
-        
+          Removed incompatible throw specification.
+
 Tue Jun 16 07:19:07 UTC 2009  Olli Savia  <ops@iki.fi>
 
         * orbsvcs/tests/EC_Mcast/EC_Mcast.cpp:
diff --git a/TAO/tao/Block_Flushing_Strategy.cpp b/TAO/tao/Block_Flushing_Strategy.cpp
index f763f46cc3d..397e4717006 100644
--- a/TAO/tao/Block_Flushing_Strategy.cpp
+++ b/TAO/tao/Block_Flushing_Strategy.cpp
@@ -49,10 +49,4 @@ TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport,
   return 0;
 }
 
-bool TAO_Block_Flushing_Strategy::is_blocking ()
-{
-  return true;
-}
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
index 2f94f4f45b9..b82ec8db0ee 100644
--- a/TAO/tao/Block_Flushing_Strategy.h
+++ b/TAO/tao/Block_Flushing_Strategy.h
@@ -37,7 +37,6 @@ public:
                              ACE_Time_Value *max_wait_time);
   virtual int flush_transport (TAO_Transport *transport
                                , ACE_Time_Value *max_wait_time);
-  virtual bool is_blocking ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Flushing_Strategy.cpp b/TAO/tao/Flushing_Strategy.cpp
index 72024d924da..6d66ee99975 100644
--- a/TAO/tao/Flushing_Strategy.cpp
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -13,10 +13,4 @@ TAO_Flushing_Strategy::~TAO_Flushing_Strategy (void)
 {
 }
 
-bool TAO_Flushing_Strategy::is_blocking ()
-{
-  return false;
-}
-
-
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
index 4787c63c51d..4bcab3d5589 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -76,8 +76,6 @@ public:
 
   /// Wait until the transport has no messages queued.
   virtual int flush_transport (TAO_Transport *transport, ACE_Time_Value *max_wait_time) = 0;
-
-  virtual bool is_blocking ();
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index ea6e73f1382..9494364a241 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -987,16 +987,6 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[],
 
       if (errno == EWOULDBLOCK || errno == EAGAIN)
         {
-          if (this->orb_core ()->flushing_strategy ()->is_blocking ())
-            {
-              // If the flushing strategy has "blocking" behavior, we can't
-              // return 0 here because it would loop indefinitely calling
-              // back into handle_output() and returning EWOULDBLOCK.
-              // This is an error condition because TAO can't handle an
-              // EWOULDBLOCK with a blocking flushing strategy.
-              return -1;
-            }
-
           return 0;
         }