aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2011-11-18 11:18:42 +0100
committerHenrik Nord <[email protected]>2011-11-18 11:18:46 +0100
commit83c82e2a2f2e13e748460ed7fcdfb87482f9fe21 (patch)
treec33d425f63dc4c79022f169073ecadaa67942efc /lib
parent448b0ce1af748594a9f1c708da491cbdcfeb3498 (diff)
parent06d560be94935377a7e3291d43072f9d4d330eb8 (diff)
downloadotp-83c82e2a2f2e13e748460ed7fcdfb87482f9fe21.tar.gz
otp-83c82e2a2f2e13e748460ed7fcdfb87482f9fe21.tar.bz2
otp-83c82e2a2f2e13e748460ed7fcdfb87482f9fe21.zip
Merge branch 'mh/odbc-shutdown-normal-exit'
* mh/odbc-shutdown-normal-exit: An ODBC process should exit normally if its client exits with 'shutdown' OTP-9716
Diffstat (limited to 'lib')
-rw-r--r--lib/odbc/src/odbc.appup.src2
-rw-r--r--lib/odbc/src/odbc.erl3
2 files changed, 5 insertions, 0 deletions
diff --git a/lib/odbc/src/odbc.appup.src b/lib/odbc/src/odbc.appup.src
index f3a3af8c29..853323da09 100644
--- a/lib/odbc/src/odbc.appup.src
+++ b/lib/odbc/src/odbc.appup.src
@@ -1,10 +1,12 @@
%% -*- erlang -*-
{"%VSN%",
[
+ {"2.10.11", [{restart_application, odbc}]},
{"2.10.10", [{restart_application, odbc}]},
{"2.10.9", [{restart_application, odbc}]}
],
[
+ {"2.10.11", [{restart_application, odbc}]},
{"2.10.10", [{restart_application, odbc}]},
{"2.10.9", [{restart_application, odbc}]}
]}.
diff --git a/lib/odbc/src/odbc.erl b/lib/odbc/src/odbc.erl
index 68497292db..36afd1abcf 100644
--- a/lib/odbc/src/odbc.erl
+++ b/lib/odbc/src/odbc.erl
@@ -748,6 +748,9 @@ handle_info({'DOWN', _Ref, _Type, _Process, normal}, State) ->
handle_info({'DOWN', _Ref, _Type, _Process, timeout}, State) ->
{stop, normal, State#state{reply_to = undefined}};
+
+handle_info({'DOWN', _Ref, _Type, _Process, shutdown}, State) ->
+ {stop, normal, State#state{reply_to = undefined}};
handle_info({'DOWN', _Ref, _Type, Process, Reason}, State) ->
{stop, {stopped, {'EXIT', Process, Reason}},