Merge branch 'v1.44'

2600hz · Dec 22, 2011 · 38a5fdf · 38a5fdf
2 parents 9f0d968 + 46573e9
commit 38a5fdf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/ecallmgr/src/ecallmgr_call_command.erl b/ecallmgr/src/ecallmgr_call_command.erl
@@ -257,7 +257,7 @@ get_fs_app(Node, UUID, JObj, <<"bridge">>) ->
                                                                put(callid, UUID),
                                                                S ! {self(), (catch get_bridge_endpoint(EP))}
                                                        end)
-                                                 || {_, EP} <- orddict:to_list(orddict:from_list(KeyedEPs))]
+                                                 || {_, EP} <- props:unique(KeyedEPs)]
                                      ], D =/= ""],
             Generators = [fun(DP) ->
                                   case wh_json:get_integer_value(<<"Timeout">>, JObj) of

diff --git a/lib/whistle-1.0.0/src/props.erl b/lib/whistle-1.0.0/src/props.erl
@@ -11,6 +11,7 @@
 
 -export([get_value/2, get_value/3, delete/2, is_defined/2]).
 -export([get_keys/1]).
+-export([unique/1]).
 
 -include_lib("whistle/include/wh_types.hrl").
 
@@ -29,15 +30,15 @@ get_value(Key, {struct, Prop}, Def) ->
     get_value(Key, Prop, Def);
 get_value(Key, Prop, Default) ->
     case lists:keyfind(Key, 1, Prop) of
-	false ->
-	    case lists:member(Key, Prop) of
-		true -> true;
-		false -> Default
-	    end;
-	{Key, V} -> % only return V if a two-tuple is found
-	    V;
-	Other when is_tuple(Other) -> % otherwise return the default
-	    Default
+        false ->
+            case lists:member(Key, Prop) of
+                true -> true;
+                false -> Default
+            end;
+        {Key, V} -> % only return V if a two-tuple is found
+            V;
+        Other when is_tuple(Other) -> % otherwise return the default
+            Default
     end.
 
 -spec get_keys/1 :: (Prop) -> [term(),...] | [] when
@@ -56,6 +57,16 @@ delete(K, Prop) ->
       Prop :: proplist().
 is_defined(Key, Prop) ->
     case lists:keyfind(Key, 1, Prop) of
-	{Key,_} -> true;
-	_ -> false
+        {Key,_} -> true;
+        _ -> false
     end.
+
+-spec unique/1 :: (proplist()) -> proplist().
+unique(List) ->
+    unique(List, []).                                                                                                                                                                                                                                                    
+
+-spec unique/2 :: (proplist(), proplist()) -> proplist().
+unique([], Uniques) ->
+    lists:reverse(Uniques);
+unique([{Key, _}=H|T], Uniques) ->
+    unique(lists:keydelete(Key, 1, T), [H|Uniques]).