Return ok from load_nif() when NIF is already loaded

processone · May 13, 2021 · 47636df · 47636df
1 parent 6d143eb
commit 47636df
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/stringprep.erl b/src/stringprep.erl
@@ -43,6 +43,7 @@ load_nif() ->
     SOPath = p1_nif_utils:get_so_path(?MODULE, [stringprep], "stringprep"),
     case catch erlang:load_nif(SOPath, 0) of
         ok -> ok;
+        {error, {reload, _}} -> ok;
         Err -> error_logger:warning_msg("unable to load stringprep NIF: ~p~n", [Err]),
                {error, unable_to_load_nif}
     end.

diff --git a/test/tests.erl b/test/tests.erl
@@ -8,6 +8,12 @@ application_start_test_() ->
                     application:ensure_all_started(stringprep)),
       ?_assertEqual(ok, stringprep:start()) ].
 
+application_start_stop_start_test_() ->
+    [ ?_assertEqual({ok, []},
+                    application:ensure_all_started(stringprep)),
+      ?_assertEqual(ok, application:stop(stringprep)),
+      ?_assertEqual(ok, stringprep:start()) ].
+
 badarg_test() ->
     ?assertError(badarg, stringprep:nodeprep(foo)),
     ?assertError(badarg, stringprep:nameprep(123)),