# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1404770962 25200
# Node ID 3e68cb17c0b63f32d67d884149f88969e7438b15
# Parent  d198328918fed8a90983f7fc4f9425db9b09c5ad
socket runs dry sends flag to tnvt to call testChanged()

diff -r d198328918fe -r 3e68cb17c0b6 src/org/tn5250j/framework/tn5250/DataStreamProducer.java
--- a/src/org/tn5250j/framework/tn5250/DataStreamProducer.java	Mon Jul 07 12:36:01 2014 -0700
+++ b/src/org/tn5250j/framework/tn5250/DataStreamProducer.java	Mon Jul 07 15:09:22 2014 -0700
@@ -146,6 +146,12 @@
         int i = 0;
 
         while (!done) {
+            try {
+                if (bin.available() == 0) dsq.put(new Integer(0));  // trigger buffer.testChanged()
+            }
+            catch (Exception ex) {
+                Log.w(TAG, "readIncoming error " + ex.getMessage());
+            }
             i = bin.read();
 
             // WVL - LDC : 16/07/2003 : TR.000345
@@ -218,6 +224,12 @@
 
         if (negotiate) {
             // get the negotiation option
+            try {
+                if (bin.available() == 0) dsq.put(new Integer(0));  // trigger buffer.testChanged()
+            }
+            catch (Exception ex) {
+                Log.w(TAG, "readIncoming error " + ex.getMessage());
+            }
             baosin.write(bin.read());
             vt.negotiate(rBytes);
             return null;
diff -r d198328918fe -r 3e68cb17c0b6 src/org/tn5250j/framework/tn5250/tnvt.java
--- a/src/org/tn5250j/framework/tn5250/tnvt.java	Mon Jul 07 12:36:01 2014 -0700
+++ b/src/org/tn5250j/framework/tn5250/tnvt.java	Mon Jul 07 15:09:22 2014 -0700
@@ -982,11 +982,10 @@
 
         while (keepTrucking) {
             try {
-                Object e = dsq.poll(0L, TimeUnit.SECONDS);
-
-                if (e == null) {
+                Object e = dsq.take();
+
+                if ((e instanceof Integer) && ((Integer)e == 0)) {
                     buffer.testChanged();
-                    e = dsq.take();
                 };
 
                 bk.initialize((byte[])e);