Changeset 198 for XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp

Timestamp:

05/19/11 19:06:32 (13 years ago)

Author:

hozdoba

Message:

 

File:

• XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp (modified) (3 diffs)

XMLIO_V2/dev/dev_rv/src/xmlio/buffer_pair.cpp

@@ -20 +20 @@
       bool CBufferPair::mustBeSent(void)
       {
-         if (((currentBuffer  ==  0) && (first.getUsedSize()  != 0) &&
-             ((second_request == -1) || CMPIManager::Test (second_request))) ||
-             ((currentBuffer  ==  1) && (second.getUsedSize() != 0) &&
-             ((first_request  == -1) || CMPIManager::Test (first_request))))
+         if ((currentBuffer  ==  0) && (first.getUsedSize()  != 0) &&
+            ((second_request == -1) || CMPIManager::Test (second_request)))
+             return (true);
+             
+         if ((currentBuffer  ==  1) && (second.getUsedSize() != 0) &&
+            ((first_request  == -1) || CMPIManager::Test (first_request)))
             return (true);
+            
          return (false);
       }
@@ -30 +33 @@
       //---------------------------------------------------------------
       
-      void CBufferPair::wait(void)
+      int CBufferPair::wait(void)
       {
          if (this->currentBuffer == 0)
-              CMPIManager::Wait(this->second_request);
-         else CMPIManager::Wait(this->first_request);
+         {
+            CMPIManager::Wait(this->second_request);
+            this->second_request = -1;
+            return (this->second_request);
+         }
+         else
+         {
+            CMPIManager::Wait(this->first_request);
+            this->first_request = -1;
+            return (this->first_request);
+         }
       }
       
@@ -45 +57 @@
             CMPIManager::SendLinearBuffer
                (this->com_client_server, 0, this->first, this->first_request);
-            this->currentBuffer = 1;
+            this->currentBuffer  =  1;
+            this->second_request = -1;
             this->second.clear();
          }
-         else
+         else  if(this->currentBuffer == 1)
          {
             CMPIManager::SendLinearBuffer
                (this->com_client_server, 0, this->second, this->second_request);
-            this->currentBuffer = 0;
+            this->currentBuffer =  0;
+            this->first_request = -1;
             this->first.clear();
          }