[X2go-Commits] nxcomp.git - upstream (branch) updated: upstream/3.5.0-1-1-g447a08c

[X2go dev team]

The branch, upstream has been updated
       via  447a08c0e8540b34704abbff0126f3f4875d29d8 (commit)
      from  f01fa8f0ac73c86195391bfcded155176354e25a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 447a08c0e8540b34704abbff0126f3f4875d29d8
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Fri Sep 30 15:21:02 2011 +0200

    Imported Upstream version 3.5.0-2

-----------------------------------------------------------------------

Summary of changes:
 CHANGELOG |    4 ++++
 Proxy.cpp |   17 +++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/CHANGELOG b/CHANGELOG
index df10c85..b7ef0d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 ChangeLog:
 
+nxcomp-3.5.0-2
+
+- Fixed TR11H02398. Solved a race condition when creating channels.
+
 nxcomp-3.5.0-1
 
 - Opened the 3.5.0 branch based on nxcomp-3.4.0-7.
diff --git a/Proxy.cpp b/Proxy.cpp
index f88259f..3b4df7e 100644
--- a/Proxy.cpp
+++ b/Proxy.cpp
@@ -1626,6 +1626,23 @@ int Proxy::handleControlFromProxy(const unsigned char *message)
   int channelId = *(message + 2);
 
   //
+  // Check if the channel has been dropped.
+  //
+
+  if (channels_[channelId] != NULL &&
+          (channels_[channelId] -> getDrop() == 1 ||
+              channels_[channelId] -> getClosing() == 1))
+  {
+    #ifdef TEST
+    *logofs << "Proxy: Dropping the descriptor FD#"
+            << getFd(channelId) << " channel ID#"
+            << channelId << ".\n" << logofs_flush;
+    #endif
+
+    handleDrop(channelId);
+  }
+
+  //
   // Check if the channel is in the valid
   // range.
   //


hooks/post-receive
-- 
nxcomp.git (NX comp library)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nxcomp.git" (NX comp library).