Eliminated Dialyzer warnings when using exit or throw.

4 files changed, 42 insertions, 15 deletions

diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
index 0ad42948af..a6b4471831 100644
--- a/lib/cosEventDomain/doc/src/notes.xml
+++ b/lib/cosEventDomain/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2001</year><year>2009</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,38 @@
   </header>
 
   <section>
+    <title>cosEventDomain 1.1.10</title>
+
+    <section>
+      <title>Improvements and New Features</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>cosEventDomain 1.1.9</title>
+
+    <section>
+      <title>Improvements and New Features</title>
+      <list type="bulleted">
+        <item>
+          <p>
+            Test suites published.</p>
+          <p>
+            Own Id: OTP-8543 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+  </section>
+
+  <section>
     <title>cosEventDomain 1.1.8</title>
 
     <section>
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
index 0b73100540..ddff0f8632 100644
--- a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
+++ b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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
@@ -780,6 +780,8 @@ set_qos(_OE_This, State, NewQoS) ->
     QoS = cosEventDomainApp:get_qos(NewQoS),
     set_qos_helper(QoS, State, []).
     
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(set_qos_helper/3 :: (_, _, _) -> no_return()).
 set_qos_helper([], State, []) ->
     {reply, ok, State};
 set_qos_helper([], _, Errors) ->
@@ -830,6 +832,8 @@ validate_qos(_OE_This, State, WantedQoS) ->
     QoS = cosEventDomainApp:get_qos(WantedQoS),
     {reply, {ok, validate_qos_helper(QoS, State, [], [])}, State}.
 
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(validate_qos_helper/4 :: (_, _, _, _) -> no_return()).
 validate_qos_helper([], _, Properties, []) ->
     Properties;
 validate_qos_helper([], _, _, Errors) ->
diff --git a/lib/cosEventDomain/src/cosEventDomainApp.erl b/lib/cosEventDomain/src/cosEventDomainApp.erl
index d57f51443c..3cb4055fba 100644
--- a/lib/cosEventDomain/src/cosEventDomainApp.erl
+++ b/lib/cosEventDomain/src/cosEventDomainApp.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2001-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
@@ -272,6 +272,8 @@ get_qos([]) ->
 get_qos(Properties) ->
     get_qos(Properties, [], []).
 
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(get_qos/3 :: (_, _, _) -> no_return()).
 get_qos([], Supported, []) ->
     Supported;
 get_qos([], _, Unsupported) ->
diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk
index 483b130819..f6d1c7a332 100644
--- a/lib/cosEventDomain/vsn.mk
+++ b/lib/cosEventDomain/vsn.mk
@@ -1,13 +1,2 @@
 
-COSEVENTDOMAIN_VSN = 1.1.8
-
-TICKETS = OTP-8353 \
-	OTP-8355
-
-TICKETS_1.1.7 = OTP-8201
-
-TICKETS_1.1.6 = OTP-7987
-
-TICKETS_1.1.5 = OTP-7837
-
-TICKETS_1.1.4 = OTP-7595
+COSEVENTDOMAIN_VSN = 1.1.10