OpenVista/GT.M Integration

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

  1. bug526609
  2. Merge into mainline
Proposed by Jon Tai
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jontai/openvista-gtm-integration/bug526609
Merge into: lp:openvista-gtm-integration
Diff against target: 31 lines (+8/-2)
1 file modified
mumps/HLCSTCP1.m (+8/-2)
To merge this branch: bzr merge lp:~jontai/openvista-gtm-integration/bug526609
Reviewer Review Type Date Requested Status
jeff.apple Approve
Review via email: mp+19991@code.launchpad.net
To post a comment you must log in.
lp:~jontai/openvista-gtm-integration/bug526609 updated
122. By Jon Tai

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

Revision history for this message
jeff.apple (jeff-apple) wrote :

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

review: Approve
lp:~jontai/openvista-gtm-integration/bug526609 updated
123. By Jon Tai

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

Preview Diff

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

Subscribers

People subscribed via source and target branches