diff options
| author | Gustav Simonsson <[email protected]> | 2012-02-14 14:56:51 +0100 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-02-14 14:56:51 +0100 |
| commit | 13ac3c70d2c4c1906db3f34291ca87c23c7f2490 (patch) | |
| tree | 683165116ec6d187a9d326ff8535f766c5ecc961 /lib/orber | |
| parent | f44819b6caa42697cbf2b6b52f95f7b87baf683f (diff) | |
| parent | 42550aa765f0336aaa103f059491d2f6a7df3a51 (diff) | |
| download | otp-13ac3c70d2c4c1906db3f34291ca87c23c7f2490.tar.gz otp-13ac3c70d2c4c1906db3f34291ca87c23c7f2490.tar.bz2 otp-13ac3c70d2c4c1906db3f34291ca87c23c7f2490.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/orber')
| -rw-r--r-- | lib/orber/src/orber_ifr.erl | 2 | ||||
| -rw-r--r-- | lib/orber/test/orber_SUITE.erl | 36 |
2 files changed, 34 insertions, 4 deletions
diff --git a/lib/orber/src/orber_ifr.erl b/lib/orber/src/orber_ifr.erl index c23374cd68..6799bc1db4 100644 --- a/lib/orber/src/orber_ifr.erl +++ b/lib/orber/src/orber_ifr.erl @@ -478,7 +478,7 @@ get_module(Id, Type) -> What -> orber:dbg("[~p] ~p:get_module(~p, ~p).~n" "Id doesn't exist, mismatch Id vs Type or DB error: ~p", - [?LINE, ?MODULE, Id, What], ?DEBUG_LEVEL), + [?LINE, ?MODULE, Id, Type, What], ?DEBUG_LEVEL), corba:raise(#'MARSHAL'{completion_status=?COMPLETED_MAYBE}) end. diff --git a/lib/orber/test/orber_SUITE.erl b/lib/orber/test/orber_SUITE.erl index be6ffa201c..72b0db1e0d 100644 --- a/lib/orber/test/orber_SUITE.erl +++ b/lib/orber/test/orber_SUITE.erl @@ -20,7 +20,6 @@ -module(orber_SUITE). -include_lib("test_server/include/test_server.hrl"). - -define(default_timeout, ?t:minutes(15)). -define(application, orber). @@ -31,7 +30,11 @@ % Test cases must be exported. -export([app_test/1, undefined_functions/1, install_load_order/1, - install_local_content/1]). + install_local_content/1, + otp_9887/1]). + +%% Exporting error handler callbacks for use in otp_9887 +-export([init/1, handle_event/2]). %% %% all/1 @@ -40,7 +43,8 @@ suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> [app_test, undefined_functions, install_load_order, - install_local_content]. + install_local_content, + otp_9887]. groups() -> []. @@ -76,6 +80,27 @@ app_test(_Config) -> ?line ok=?t:app_test(orber), ok. +otp_9887(_Config) -> + orber:jump_stop(), + application:set_env(orber, orber_debug_level, 10), + orber:jump_start([]), + + mnesia:create_table(orber_light_ifr, []), + + error_logger:add_report_handler(?MODULE,[self()]), + catch orber_ifr:get_module(foo, bar), + + receive + {stolen,Reason} -> + {error,_Pid1, {_Pid2, _ErrorString, ArgumentList}} = Reason, + 5 = length(ArgumentList) + after 500 -> + test_server:fail("OTP_9887 TIMED OUT") + end, + + orber:jump_stop(), + ok. + %% Install Orber using the load_order option. install_load_order(suite) -> []; @@ -192,5 +217,10 @@ key1search(Key, L) -> fail(Reason) -> exit({suite_failed, Reason}). +%% Error handler +init([Proc]) -> {ok,Proc}. +handle_event(Event, Proc) -> + Proc ! {stolen,Event}, + {ok,Proc}. |