diff options
| author | Siri Hansen <[email protected]> | 2011-11-25 09:17:38 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-11-25 09:17:38 +0100 |
| commit | 168787fcfb1f8311d3e4e57821b7cddebe2d6ba2 (patch) | |
| tree | 3eea7f609945d5bcc78fbc3c5a873181ad4f74ba /lib/sasl/src | |
| parent | e1a5e0ae5ac0eec45034ccfc440807fce0731716 (diff) | |
| parent | 0d437e4a7d1d4890111f3ba29e45ffc3137232ff (diff) | |
| download | otp-168787fcfb1f8311d3e4e57821b7cddebe2d6ba2.tar.gz otp-168787fcfb1f8311d3e4e57821b7cddebe2d6ba2.tar.bz2 otp-168787fcfb1f8311d3e4e57821b7cddebe2d6ba2.zip | |
Merge branch 'siri/sasl/xxgrade_app-with-restart/OTP-9735'
* siri/sasl/xxgrade_app-with-restart/OTP-9735:
Fix release_handler:upgrade_app and downgrade_app when upgrading emulator
Diffstat (limited to 'lib/sasl/src')
| -rw-r--r-- | lib/sasl/src/release_handler_1.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sasl/src/release_handler_1.erl b/lib/sasl/src/release_handler_1.erl index b4b288646f..37275eff45 100644 --- a/lib/sasl/src/release_handler_1.erl +++ b/lib/sasl/src/release_handler_1.erl @@ -459,7 +459,9 @@ eval({apply, {M, F, A}}, EvalState) -> apply(M, F, A), EvalState; eval(restart_emulator, _EvalState) -> - throw(restart_emulator). + throw(restart_emulator); +eval(restart_new_emulator, _EvalState) -> + throw(restart_new_emulator). get_opt(Tag, EvalState, Default) -> case lists:keysearch(Tag, 1, EvalState#eval_state.opts) of |