aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosProperty
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2011-02-10 16:18:50 +0100
committerNiclas Eklund <[email protected]>2011-02-10 16:18:50 +0100
commit59bb06a90248defb4c0be98f10afae88c2251fe7 (patch)
tree5cc2b0b25becec926f9d3981579b8038b95cbcec /lib/cosProperty
parent06ff115c291c4bb07a728bbeb72f67822e9d4b80 (diff)
downloadotp-59bb06a90248defb4c0be98f10afae88c2251fe7.tar.gz
otp-59bb06a90248defb4c0be98f10afae88c2251fe7.tar.bz2
otp-59bb06a90248defb4c0be98f10afae88c2251fe7.zip
Eliminated Dialyzer warnings when using exit or throw.
Diffstat (limited to 'lib/cosProperty')
-rw-r--r--lib/cosProperty/doc/src/notes.xml30
-rw-r--r--lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl5
-rw-r--r--lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl7
-rw-r--r--lib/cosProperty/vsn.mk12
4 files changed, 39 insertions, 15 deletions
diff --git a/lib/cosProperty/doc/src/notes.xml b/lib/cosProperty/doc/src/notes.xml
index e80c90849f..770d50f777 100644
--- a/lib/cosProperty/doc/src/notes.xml
+++ b/lib/cosProperty/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2000</year><year>2009</year>
+ <year>2000</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -38,6 +38,34 @@
<title>Fixed Bugs and Malfunctions</title>
<list type="bulleted">
<item>
+ <p>Eliminated Dialyzer warnings when using exit or throw.</p>
+ <p>Own id: OTP-9050 Aux Id:</p>
+ </item>
+ </list>
+ </section>
+ </section>
+
+ <section>
+ <title>cosProperty 1.1.12</title>
+
+ <section>
+ <title>Fixed Bugs and Malfunctions</title>
+ <list type="bulleted">
+ <item>
+ <p>Test suites published.</p>
+ <p>Own id: OTP-8543 Aux Id:</p>
+ </item>
+ </list>
+ </section>
+ </section>
+
+ <section>
+ <title>cosProperty 1.1.11</title>
+
+ <section>
+ <title>Fixed Bugs and Malfunctions</title>
+ <list type="bulleted">
+ <item>
<p>The documentation EIX file was not generated.</p>
<p>Own id: OTP-8355 Aux Id:</p>
</item>
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
index b099026b88..45fd097bff 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetDefFactory_impl.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -153,6 +153,9 @@ create_initial_propertysetdef(_OE_This, State, PropDefs) ->
%%======================================================================
evaluate_propertysetdef(SetDefs) ->
evaluate_propertysetdef(SetDefs, [], []).
+
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(evaluate_propertysetdef/3 :: (_, _, _) -> no_return()).
evaluate_propertysetdef([], NewProperties, []) ->
%% No exceptions found.
NewProperties;
diff --git a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
index ad3cdb62d4..c251421205 100644
--- a/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
+++ b/lib/cosProperty/src/CosPropertyService_PropertySetFactory_impl.erl
@@ -2,10 +2,10 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2000-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2000-2011. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
+%% Version 1.1, (the "License"); yu may not use this file except in
%% compliance with the License. You should have received a copy of the
%% Erlang Public License along with this software. If not, it can be
%% retrieved online at http://www.erlang.org/.
@@ -154,6 +154,9 @@ create_initial_propertyset(_OE_This, State, Properties) ->
%%======================================================================
evaluate_propertyset(Sets) ->
evaluate_propertyset(Sets, [], []).
+
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(evaluate_propertyset/3 :: (_, _, _) -> no_return()).
evaluate_propertyset([], NewProperties, []) ->
%% No exceptions found.
NewProperties;
diff --git a/lib/cosProperty/vsn.mk b/lib/cosProperty/vsn.mk
index c221e6fa4a..6d770a7d69 100644
--- a/lib/cosProperty/vsn.mk
+++ b/lib/cosProperty/vsn.mk
@@ -1,11 +1 @@
-COSPROPERTY_VSN = 1.1.11
-
-TICKETS = OTP-8355
-
-TICKETS_1.1.10 = OTP-8201
-
-TICKETS_1.1.9 = OTP-7987
-
-TICKETS_1.1.8 = OTP-7837
-
-TICKETS_1.1.7 = OTP-7595
+COSPROPERTY_VSN = 1.1.13