From 3d08bfbd778ed8c543f4eb9f2c45ee50d45d8092 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Wed, 19 Oct 2016 14:34:17 +0200 Subject: [orber] Fix dialyzer warnings Removed two matching errors and one unused clause found by dialyzer. --- lib/orber/COSS/CosNaming/CosNaming_NamingContextExt_impl.erl | 7 +------ lib/orber/src/corba.erl | 2 +- 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 = -- cgit v1.2.3 From 3e32808b78e7b5298cd403c8edf0bd520530de0e Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Wed, 19 Oct 2016 14:39:37 +0200 Subject: [cosProperty] Fix dialyzer warning Remove one unused clause found by dialyzer. --- lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl index bf046530d8..371e72cf72 100644 --- a/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl +++ b/lib/cosProperty/src/CosPropertyService_PropertySetDef_impl.erl @@ -913,8 +913,6 @@ mnesia_read(State) -> case mnesia:wread({oe_CosPropertyService, ?get_DBKey(State)}) of [#oe_CosPropertyService{properties = X}] -> X; - {atomic, []} -> - {'EXCEPTION', #'OBJECT_NOT_EXIST'{completion_status=?COMPLETED_NO}}; _Other -> {'EXCEPTION', #'INTERNAL'{completion_status=?COMPLETED_NO}} end. -- cgit v1.2.3 From f7dbee285942b4518b3b695edf55863ef50e9598 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Fri, 4 Nov 2016 12:37:22 +0100 Subject: [orber] Update version and release notes --- lib/orber/doc/src/notes.xml | 14 ++++++++++++++ lib/orber/vsn.mk | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml index 89f258e5e9..5a82270b28 100644 --- a/lib/orber/doc/src/notes.xml +++ b/lib/orber/doc/src/notes.xml @@ -33,6 +33,20 @@ notes.xml +
Orber 3.8.3 + +
Improvements and New Features + + +

+ Fix some dialyzer warnings

+

+ Own Id: OTP-14006

+
+
+
+ +
Orber 3.8.2 diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk index dcb2c985a3..595e686cb7 100644 --- a/lib/orber/vsn.mk +++ b/lib/orber/vsn.mk @@ -1 +1 @@ -ORBER_VSN = 3.8.2 +ORBER_VSN = 3.8.3 -- cgit v1.2.3 From 83b4563da00bcfd16f8c1883f83cbdac77fad925 Mon Sep 17 00:00:00 2001 From: Lars Thorsen Date: Fri, 4 Nov 2016 12:43:08 +0100 Subject: [cosProperty] Update version and release notes --- lib/cosProperty/doc/src/notes.xml | 16 ++++++++++++++++ lib/cosProperty/vsn.mk | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml index d5219fc110..e5d22982c5 100644 --- a/lib/cosProperty/doc/src/notes.xml +++ b/lib/cosProperty/doc/src/notes.xml @@ -32,6 +32,22 @@ notes.xml + +
cosProperty 1.2.2 + +
Improvements and New Features + + +

+ Fix dialyzer warnings.

+

+ Own Id: OTP-14006

+
+
+
+ +
+
cosProperty 1.2.1
Improvements and New Features diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk index 1a8e42ffdb..78ba88445d 100644 --- a/lib/cosProperty/vsn.mk +++ b/lib/cosProperty/vsn.mk @@ -1,2 +1,2 @@ -COSPROPERTY_VSN = 1.2.1 +COSPROPERTY_VSN = 1.2.2 -- cgit v1.2.3