From 59bb06a90248defb4c0be98f10afae88c2251fe7 Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Thu, 10 Feb 2011 16:18:50 +0100
Subject: Eliminated Dialyzer warnings when using exit or throw.

---
 lib/orber/doc/src/notes.xml     | 18 +++++++++++++++++-
 lib/orber/include/ifr_types.hrl |  4 ++--
 lib/orber/src/orber.app.src     |  2 +-
 lib/orber/src/orber.erl         |  4 +++-
 lib/orber/vsn.mk                |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'lib/orber')

diff --git a/lib/orber/doc/src/notes.xml b/lib/orber/doc/src/notes.xml
index ba16682f0b..589123ef73 100644
--- a/lib/orber/doc/src/notes.xml
+++ b/lib/orber/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>1997</year><year>2010</year>
+      <year>1997</year><year>2011</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -32,6 +32,22 @@
     <file>notes.xml</file>
   </header>
 
+  <section>
+    <title>Orber 3.6.20</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>Orber 3.6.19</title>
 
diff --git a/lib/orber/include/ifr_types.hrl b/lib/orber/include/ifr_types.hrl
index d982850e98..f4a1c533e1 100644
--- a/lib/orber/include/ifr_types.hrl
+++ b/lib/orber/include/ifr_types.hrl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 1997-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -54,7 +54,7 @@
 			 id = Obj#Object_type.id,
 			 defined_in = Obj#Object_type.defined_in,
 			 version = Obj#Object_type.version,
-			 type = Obj#Object_type.type}.
+			 type = Obj#Object_type.type}).
 
 -record(exceptiondescription, {name, id, defined_in, version, type}).
 
diff --git a/lib/orber/src/orber.app.src b/lib/orber/src/orber.app.src
index fe911d65a4..88df4162b6 100644
--- a/lib/orber/src/orber.app.src
+++ b/lib/orber/src/orber.app.src
@@ -101,7 +101,7 @@
 	        orber_iiop_insup, orber_init, orber_reqno,
 	        orber_objkeyserver, orber_iiop_socketsup, 
                 orber_iiop_pm, orber_env]},
-  {applications, [stdlib, kernel]},
+  {applications, [stdlib, kernel, mnesia]},
   {env, []},
   {mod, {orber, []}}
 ]}.
diff --git a/lib/orber/src/orber.erl b/lib/orber/src/orber.erl
index c3d37ad1fb..9902306161 100644
--- a/lib/orber/src/orber.erl
+++ b/lib/orber/src/orber.erl
@@ -2,7 +2,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1997-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1997-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
@@ -1029,6 +1029,8 @@ remove_node(Node) when is_atom(Node) ->
 remove_tables(Tables, Node) ->
     remove_tables(Tables, Node, []).
 
+%% To avoid dialyzer warnings due to the use of exit/throw.
+-spec(remove_tables/3 :: (_, _, _) -> no_return()).
 remove_tables([], _, []) -> ok;
 remove_tables([], Node, Failed) ->
     ?EFORMAT("orber:remove_node(~p) failed. Unable to remove table(s): ~p", 
diff --git a/lib/orber/vsn.mk b/lib/orber/vsn.mk
index c265db188f..5f17cda229 100644
--- a/lib/orber/vsn.mk
+++ b/lib/orber/vsn.mk
@@ -1,3 +1,3 @@
 
-ORBER_VSN = 3.6.19
+ORBER_VSN = 3.6.20
 
-- 
cgit v1.2.3