diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl | 7 | ||||
| -rw-r--r-- | lib/orber/src/corba.erl | 2 | ||||
| -rw-r--r-- | lib/orber/src/orber_ifr_contained.erl | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl b/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl index 545be62852..8f7da2425b 100644 --- a/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl +++ b/lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl @@ -624,12 +624,7 @@ destroy(OE_THIS, OE_State) -> orber:dbg("[~p] ~p:destroy(~p);~n" "DB access returned ~p", [?LINE, ?MODULE, SubobjKey, Other], ?DEBUG_LEVEL), - {'EXCEPTION', #'CosNaming_NamingContext_NotEmpty'{}}; - Other -> - orber:dbg("[~p] ~p:destroy(~p);~n" - "DB access returned ~p", - [?LINE, ?MODULE, SubobjKey, Other], ?DEBUG_LEVEL), - {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}} + {'EXCEPTION', #'CosNaming_NamingContext_NotEmpty'{}} end end, case mnesia:transaction(_DF) of diff --git a/lib/orber/src/corba.erl b/lib/orber/src/corba.erl index faebbc4059..1be84f5a83 100644 --- a/lib/orber/src/corba.erl +++ b/lib/orber/src/corba.erl @@ -2115,7 +2115,7 @@ call_RQprotected(Module, Obj, Func, Args, GroupID, RQCtx) -> sticky_write), Reply; % retransmitted request - #ft_reply_retention{reply = Reply} -> + [#ft_reply_retention{reply = Reply}] -> Reply end. diff --git a/lib/orber/src/orber_ifr_contained.erl b/lib/orber/src/orber_ifr_contained.erl index d5f41fbe72..2a67fa98fd 100644 --- a/lib/orber/src/orber_ifr_contained.erl +++ b/lib/orber/src/orber_ifr_contained.erl @@ -232,7 +232,7 @@ move(true, Contained_objref, New_container, New_name, New_version) -> lists:filter(fun(X) -> X /= Contained_objref end, select(Old_container_obj, contents))), - New_container_obj = mnesia:read(New_container), + [New_container_obj] = mnesia:read(New_container), Contents = orber_ifr_container:contents(New_container, dk_All, true), New_new_container_obj = |