Merge lp:~jontai/openvista-gtm-integration/bug526609 into lp:openvista-gtm-integration

[Jon Tai]

[lp:~jontai/openvista-gtm-integration/bug526609]

122. By Jon Tai on 2010-02-23

grab updated version that actually contains the $D(HLMSG) check

[jeff.apple (jeff-apple)]

Looks very good.
("Because" is misspelled, but that's as trivial as it gets.)

review: Approve

[lp:~jontai/openvista-gtm-integration/bug526609]

123. By Jon Tai on 2010-02-23

Fix spelling error, thanks Jeff. I need to figure out how to set up the vim spell checking stuff.

=== modified file 'mumps/HLCSTCP1.m'
--- mumps/HLCSTCP1.m	2009-06-05 20:09:12 +0000
+++ mumps/HLCSTCP1.m	2010-02-23 18:59:13 +0000
@@ -1,4 +1,4 @@
-HLCSTCP1 ;SFIRMFO/RSD MSC/JDA - BI-DIRECTIONAL TCP ;13APR2009
+HLCSTCP1 ;SFIRMFO/RSD MSC/JDA,JKT - BI-DIRECTIONAL TCP ;23FEB2010
  ;;1.6;HEALTH LEVEL SEVEN;**19,43,57,64,71,MSC**;JUL 17,1995
  ;Receiver
  ;connection is initiated by sender and listener accepts connection
@@ -42,7 +42,7 @@
  Q HLIND1
  ;
 RDBLK S HLDB=HLDBSIZE-$L(HLX)
- U IO D:$D ERROR R X#HLDB:HLDREAD ; MSC/JDA added check against $d
+ U IO D:$D ERROR R X#HLDB:HLDREAD ; MSC/JDA added check against $DEVICE
  ; timedout or error, check ack timeout, clean up
  I '$T,X="",HLX="" S HLACKWT=HLACKWT-HLDREAD D:HLACKWT<0&'HLHDR CLEAN Q
  ;data stream: <sb>dddd<cr><eb><cr>
@@ -162,6 +162,12 @@
  S $ETRAP="D UNWIND^%ZTER"
  I $$EC^%ZOSV["READ"!($$EC^%ZOSV["NOTOPEN")!($$EC^%ZOSV["DEVNOTOPN") D UNWIND^%ZTER Q
  I $$EC^%ZOSV["WRITE" D CC("Wr-err") D UNWIND^%ZTER Q
+ ;
+ ; If the other side disconnected, but no message was being sent, just go back to listening.
+ ; Because we're checking for a specific $D string, this probably only gets triggered on GT.M.
+ ; Cache is handled by the $$EC^%ZOSV checks above.  See <https://launchpad.net/bugs/526609>
+ I $P($D,",",2)="Connection reset by peer",'$D(HLMSG) D UNWIND^%ZTER Q
+ ;
  S HLCSOUT=1 D ^%ZTER,CC("Error")
  D UNWIND^%ZTER
  Q