diff options
| author | Björn Gustavsson <[email protected]> | 2011-12-07 07:34:42 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-12-07 07:34:42 +0100 |
| commit | 6b31de5969abeb37f7d8d43815a236abadb42508 (patch) | |
| tree | 4b090efba362d98cc50b8c9bbe6a64c12063ce9d /erts/emulator/beam | |
| parent | def5c6bf40176c975df4a86925ee931141b302df (diff) | |
| parent | d3f9c506627a02f8f258899cab85d0bac9abfa91 (diff) | |
| download | otp-6b31de5969abeb37f7d8d43815a236abadb42508.tar.gz otp-6b31de5969abeb37f7d8d43815a236abadb42508.tar.bz2 otp-6b31de5969abeb37f7d8d43815a236abadb42508.zip | |
Merge branch 'bjorn/erts/code-loading/OTP-9720'
* bjorn/erts/code-loading/OTP-9720:
BEAM loader: Fix bug that allowed loading of more than two versions
Add code_SUITE:versions/1
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/beam_load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/beam_load.c b/erts/emulator/beam/beam_load.c index e6fbdc0d45..dd788df6e4 100644 --- a/erts/emulator/beam/beam_load.c +++ b/erts/emulator/beam/beam_load.c @@ -956,7 +956,7 @@ insert_new_code(Process *c_p, ErtsProcLocks c_p_locks, Eterm retval; int i; - if ((retval = beam_make_current_old(c_p, c_p_locks, module)) < 0) { + if ((retval = beam_make_current_old(c_p, c_p_locks, module)) != NIL) { erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf(); erts_dsprintf(dsbufp, "Module %T must be purged before loading\n", |