pass correct timeout value to selector. limit pixel depth to 24 (OS X defaults to 32). Increase write buffer size to match CXX value.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4867 3789f03b-4d11-0410-bbf8-ca57d06f2519

1 files changed, 7 insertions, 1 deletions

diff --git a/java/com/tigervnc/network/SocketDescriptor.java b/java/com/tigervnc/network/SocketDescriptor.java
index 2a4c6d81..cb478127 100644
--- a/java/com/tigervnc/network/SocketDescriptor.java
+++ b/java/com/tigervnc/network/SocketDescriptor.java
@@ -83,10 +83,16 @@ public class SocketDescriptor extends SocketChannel
   synchronized public int select(int interestOps, int timeout) throws Exception {
     int n;
     try {
-      n = selector.select(timeout);
+      if (timeout == 0) {
+        n = selector.selectNow();
+      } else {
+        n = selector.select(timeout);
+      }
     } catch (java.io.IOException e) {
       throw new Exception(e.toString());
     }
+    if (n == 0)
+      return -1;
     Set keys = selector.selectedKeys();
     Iterator iter = keys.iterator();
     while (iter.hasNext()) {