Merge branch 'dev' of super:otp into dev

4 files changed, 47 insertions, 14 deletions

diff --git a/lib/cosEventDomain/doc/src/notes.xml b/lib/cosEventDomain/doc/src/notes.xml
index deb1985c86..522dcea829 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>2010</year>
+      <year>2001</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,7 +32,24 @@
   </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">
@@ -44,7 +61,6 @@
         </item>
       </list>
     </section>
-
   </section>
 
   <section>
diff --git a/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl b/lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
index 0b73100540..f5dd6d5c14 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
@@ -778,12 +778,17 @@ get_qos(_OE_This, #state{cyclic = Cyclic, diamonds = Diamonds} = State) ->
 %%----------------------------------------------------------------------
 set_qos(_OE_This, State, NewQoS) ->
     QoS = cosEventDomainApp:get_qos(NewQoS),
-    set_qos_helper(QoS, State, []).
+    case set_qos_helper(QoS, State, []) of
+	{ok, NewState} ->
+	    {reply, ok, NewState};
+	{error, Errors} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
+    end.
     
 set_qos_helper([], State, []) ->
-    {reply, ok, State};
+    {ok, State}; %{reply, ok, State};
 set_qos_helper([], _, Errors) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors});
+    {error, Errors};
 set_qos_helper([{?DiamondDetection, Diamonds}|T], #state{diamonds = Diamonds} = State,
 	       Errors) ->
     set_qos_helper(T, State, Errors);
@@ -828,12 +833,17 @@ set_qos_helper([{?CycleDetection, _}|T], #state{cyclic = Cyclic} = State, Errors
 %%----------------------------------------------------------------------
 validate_qos(_OE_This, State, WantedQoS) ->
     QoS = cosEventDomainApp:get_qos(WantedQoS),
-    {reply, {ok, validate_qos_helper(QoS, State, [], [])}, State}.
+    case validate_qos_helper(QoS, State, [], []) of
+	{ok, Properties} ->
+	    {reply, {ok, Properties}, State};
+	{error, Errors} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
+    end.
 
 validate_qos_helper([], _, Properties, []) ->
-    Properties;
+    {ok, Properties};
 validate_qos_helper([], _, _, Errors) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors});
+    {error, Errors};
 validate_qos_helper([{?DiamondDetection, ?ForbidDiamonds}|T], State, Properties, 
 		    Errors) ->
     case get_diamonds_helper(State, false) of
diff --git a/lib/cosEventDomain/src/cosEventDomainApp.erl b/lib/cosEventDomain/src/cosEventDomainApp.erl
index d57f51443c..734e4deccb 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
@@ -270,12 +270,17 @@ create_id() ->
 get_qos([]) ->
     [];
 get_qos(Properties) ->
-    get_qos(Properties, [], []).
+    case get_qos(Properties, [], []) of
+	{ok, Supported} ->
+	    Supported;
+	{error, Unsupported} ->
+	    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupported})
+    end.
 
 get_qos([], Supported, []) ->
-    Supported;
+    {ok, Supported};
 get_qos([], _, Unsupported) ->
-    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Unsupported});
+    {error, Unsupported};
 get_qos([#'CosNotification_Property'{name = ?CycleDetection,
 				     value= #any{value = ?AuthorizeCycles}}|T], 
 	Supported, Unsupported) ->
diff --git a/lib/cosEventDomain/vsn.mk b/lib/cosEventDomain/vsn.mk
index bd21133fe5..f4a77ab7a8 100644
--- a/lib/cosEventDomain/vsn.mk
+++ b/lib/cosEventDomain/vsn.mk
@@ -1 +1,3 @@
-COSEVENTDOMAIN_VSN = 1.1.9
+
+COSEVENTDOMAIN_VSN = 1.1.10
+