Only reply keep-alive if expecting it

jpos · Jul 7, 2023 · 9e9c110 · 9e9c110
1 parent d82313a
commit 9e9c110
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/jpos/src/main/java/org/jpos/iso/BaseChannel.java b/jpos/src/main/java/org/jpos/iso/BaseChannel.java
@@ -678,6 +678,11 @@ public void sendKeepAlive () throws IOException {
             serverOutLock.unlock();
         }
     }
+
+    public boolean isExpectKeepAlive() {
+        return expectKeepAlive;
+    }
+
     protected boolean isRejected(byte[] b) {
         // VAP Header support - see VAPChannel
         return false;

diff --git a/jpos/src/main/java/org/jpos/iso/channel/ASCIIChannel.java b/jpos/src/main/java/org/jpos/iso/channel/ASCIIChannel.java
@@ -76,7 +76,7 @@ public ASCIIChannel (ISOPackager p) throws IOException {
      * @exception IOException
      * @see ISOPackager
      */
-    public ASCIIChannel (ISOPackager p, ServerSocket serverSocket) 
+    public ASCIIChannel (ISOPackager p, ServerSocket serverSocket)
         throws IOException
     {
         super(p, serverSocket);
@@ -110,11 +110,15 @@ protected int getMessageLength() throws IOException, ISOException {
         while (l == 0) {
             serverIn.readFully(b, 0, lengthDigits);
             try {
-                if ((l=Integer.parseInt(new String(b))) == 0) {
-                    serverOut.write(b);
-                    serverOut.flush();
+                if ((l=Integer.parseInt(new String(b))) == 0 &&
+                    isExpectKeepAlive()) {
+
+                    synchronized (serverOutLock) {
+                        serverOut.write(b);
+                        serverOut.flush();
+                    }
                 }
-            } catch (NumberFormatException e) { 
+            } catch (NumberFormatException e) {
                 throw new ISOException ("Invalid message length "+new String(b));
             }
         }