[Lldb-commits] [lldb] r120883 - /lldb/trunk/source/Core/Communication.cpp

[Greg Clayton]

Author: gclayton
Date: Fri Dec  3 20:22:36 2010
New Revision: 120883

URL: http://llvm.org/viewvc/llvm-project?rev=120883&view=rev
Log:
Reverted the close on EOF stuff again as it was crashing Xcode.


Modified:
    lldb/trunk/source/Core/Communication.cpp

Modified: lldb/trunk/source/Core/Communication.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/Communication.cpp?rev=120883&r1=120882&r2=120883&view=diff
==============================================================================
--- lldb/trunk/source/Core/Communication.cpp (original)
+++ lldb/trunk/source/Core/Communication.cpp Fri Dec  3 20:22:36 2010
@@ -266,8 +266,7 @@
     lldb_private::LogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION,
                                  "%p Communication::AppendBytesToCache (src = %p, src_len = %zu, broadcast = %i)",
                                  this, bytes, len, broadcast);
-    if ((bytes == NULL || len == 0)
-        && (status != eConnectionStatusEndOfFile))
+    if (bytes == NULL || len == 0)
         return;
     if (m_callback)
     {
@@ -327,21 +326,14 @@
             size_t bytes_read = comm->ReadFromConnection (buf, sizeof(buf), status, &error);
             if (bytes_read > 0)
                 comm->AppendBytesToCache (buf, bytes_read, true, status);
-            else if ((bytes_read == 0)
-                    && status == eConnectionStatusEndOfFile)
-            {
-                if (comm->CloseOnEOF ())
-                    comm->Disconnect ();
-                comm->AppendBytesToCache (buf, bytes_read, true, status);
-            }
         }
 
         switch (status)
         {
         case eConnectionStatusSuccess:
-        case eConnectionStatusEndOfFile:
             break;
 
+        case eConnectionStatusEndOfFile:
         case eConnectionStatusNoConnection:     // No connection
         case eConnectionStatusLostConnection:   // Lost connection while connected to a valid connection
             done = true;