← Back to branch summary

~clint-fewbar/ubuntu/precise/erlang/merge-15b

« back to all changes in this revision

Viewing changes to lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl

  • Committer: Package Import Robot
  • Author(s): Sergei Golovan
  • Date: 2011-12-15 19:20:10 UTC
  • mfrom: (1.1.18) (3.5.15 sid)
  • mto: (3.5.16 sid)
  • mto: This revision was merged to the branch mainline in revision 33.
  • Revision ID: package-import@ubuntu.com-20111215192010-jnxcfe3tbrpp0big
Tags: 1:15.b-dfsg-1
* New upstream release.
* Upload to experimental because this release breaks external drivers
  API along with ABI, so several applications are to be fixed.
* Removed SSL patch because the old SSL implementation is removed from
  the upstream distribution.
* Removed never used patch which added native code to erlang beam files.
* Removed the erlang-docbuilder binary package because the docbuilder
  application was dropped by upstream.
* Documented dropping ${erlang-docbuilder:Depends} substvar in
  erlang-depends(1) manpage.
* Made erlang-base and erlang-base-hipe provide virtual package
  erlang-abi-15.b (the number means the first erlang version, which
  provides current ABI).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cosEventDomain/src/CosEventDomainAdmin_EventDomain_impl.erl
2
2
%%
3
3
%% %CopyrightBegin%
4
4
%% 
5
 
%% Copyright Ericsson AB 2001-2009. All Rights Reserved.
 
5
%% Copyright Ericsson AB 2001-2011. All Rights Reserved.
6
6
%% 
7
7
%% The contents of this file are subject to the Erlang Public License,
8
8
%% Version 1.1, (the "License"); you may not use this file except in
778
778
%%----------------------------------------------------------------------
779
779
set_qos(_OE_This, State, NewQoS) ->
780
780
    QoS = cosEventDomainApp:get_qos(NewQoS),
781
 
    set_qos_helper(QoS, State, []).
 
781
    case set_qos_helper(QoS, State, []) of
 
782
        {ok, NewState} ->
 
783
            {reply, ok, NewState};
 
784
        {error, Errors} ->
 
785
            corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
 
786
    end.
782
787
    
783
788
set_qos_helper([], State, []) ->
784
 
    {reply, ok, State};
 
789
    {ok, State}; %{reply, ok, State};
785
790
set_qos_helper([], _, Errors) ->
786
 
    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors});
 
791
    {error, Errors};
787
792
set_qos_helper([{?DiamondDetection, Diamonds}|T], #state{diamonds = Diamonds} = State,
788
793
               Errors) ->
789
794
    set_qos_helper(T, State, Errors);
828
833
%%----------------------------------------------------------------------
829
834
validate_qos(_OE_This, State, WantedQoS) ->
830
835
    QoS = cosEventDomainApp:get_qos(WantedQoS),
831
 
    {reply, {ok, validate_qos_helper(QoS, State, [], [])}, State}.
 
836
    case validate_qos_helper(QoS, State, [], []) of
 
837
        {ok, Properties} ->
 
838
            {reply, {ok, Properties}, State};
 
839
        {error, Errors} ->
 
840
            corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors})
 
841
    end.
832
842
 
833
843
validate_qos_helper([], _, Properties, []) ->
834
 
    Properties;
 
844
    {ok, Properties};
835
845
validate_qos_helper([], _, _, Errors) ->
836
 
    corba:raise(#'CosNotification_UnsupportedQoS'{qos_err = Errors});
 
846
    {error, Errors};
837
847
validate_qos_helper([{?DiamondDetection, ?ForbidDiamonds}|T], State, Properties, 
838
848
                    Errors) ->
839
849
    case get_diamonds_helper(State, false) of