aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Henoch <[email protected]>2011-10-21 17:46:44 +0100
committerHenrik Nord <[email protected]>2011-11-17 11:08:29 +0100
commit06d560be94935377a7e3291d43072f9d4d330eb8 (patch)
treeb8c4eedd1f33108f593338afc7c7f6f03a972a9d
parentb6dc1a844eab061d0a7153d46e7e68296f15a504 (diff)
downloadotp-06d560be94935377a7e3291d43072f9d4d330eb8.tar.gz
otp-06d560be94935377a7e3291d43072f9d4d330eb8.tar.bz2
otp-06d560be94935377a7e3291d43072f9d4d330eb8.zip
An ODBC process should exit normally if its client exits with 'shutdown'
There is nothing strange about the client shutting down, so the ODBC process should exit normally to avoid generating a crash report for a non-problem. Update appup.src for new version
-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}},