← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl

  • Committer: Bazaar Package Importer
  • Author(s): Sergei Golovan
  • Date: 2009-06-11 12:18:07 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20090611121807-ks7eb4xrt7dsysgx
Tags: 1:13.b.1-dfsg-1
http://bugs.debian.org/529512
* New upstream release.
* Removed unnecessary dependency of erlang-os-mon on erlang-observer and
  erlang-tools and added missing dependency of erlang-nox on erlang-os-mon
  (closes: #529512).
* Removed a patch to eunit application because the bug was fixed upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cosNotification/src/CosNotifyFilter_Filter_impl.erl
303
303
%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
304
304
%%-----------------------------------------------------------
305
305
 
306
 
match(_OE_THIS, State, Event) when record(Event,'any'), ?is_EmptyFilter(State) ->
 
306
match(_OE_THIS, State, Event) when is_record(Event,'any'), ?is_EmptyFilter(State) ->
307
307
    {reply, true, State};
308
 
match(_OE_THIS, State, Event) when record(Event,'any') ->
 
308
match(_OE_THIS, State, Event) when is_record(Event,'any') ->
309
309
    match_any_event(State, Event, ?get_ConstraintAllData(State));
310
310
match(_,_,What) ->
311
311
    orber:dbg("[~p] CosNotifyFilter_Filter:match(~p);~n"
319
319
%%            {'EXCEPTION', CosNotifyFilter::UnsupportedFilterableData}
320
320
%%-----------------------------------------------------------
321
321
match_structured(_OE_THIS, State, Event) when 
322
 
  record(Event,'CosNotification_StructuredEvent'), ?is_EmptyFilter(State) ->
 
322
  is_record(Event,'CosNotification_StructuredEvent') andalso ?is_EmptyFilter(State) ->
323
323
    {reply, true, State};
324
324
match_structured(_OE_THIS, State, Event) when 
325
 
  record(Event,'CosNotification_StructuredEvent') ->
 
325
  is_record(Event,'CosNotification_StructuredEvent') ->
326
326
    match_str_event(State, Event, ?get_ConstraintAllData(State));
327
327
match_structured(_,_,What) ->
328
328
    orber:dbg("[~p] CosNotifyFilter_Filter:match_structured(~p);~n"
353
353
%% Arguments: ID - CosNotifyFilter::CallbackID
354
354
%% Returns  : ok | {'EXCEPTION', CosNotifyFilter::CallbackNotFound}
355
355
%%-----------------------------------------------------------
356
 
detach_callback(_OE_THIS, State, ID) when integer(ID) ->
 
356
detach_callback(_OE_THIS, State, ID) when is_integer(ID) ->
357
357
    {reply, ok, ?del_Callback(State, ID)};
358
358
detach_callback(_,_,What) ->
359
359
    orber:dbg("[~p] CosNotifyFilter_Filter:detach_callback(~p);~n"
409
409
lookup_constraints([], _State, Accum) ->
410
410
    Accum;
411
411
lookup_constraints([H|T], State, Accum) 
412
 
  when record(H, 'CosNotifyFilter_ConstraintInfo') ->
 
412
  when is_record(H, 'CosNotifyFilter_ConstraintInfo') ->
413
413
    case ?get_Constraint(State, H#'CosNotifyFilter_ConstraintInfo'.constraint_id) of
414
414
        error ->
415
415
            corba:raise(#'CosNotifyFilter_ConstraintNotFound'
419
419
            %% the correct type, i.e., ConstraintInfoSeq
420
420
            lookup_constraints(T, State, Accum)
421
421
    end;
422
 
lookup_constraints([H|T], State, Accum) when integer(H) ->
 
422
lookup_constraints([H|T], State, Accum) when is_integer(H) ->
423
423
    case ?get_Constraint(State,H) of
424
424
        error ->
425
425
            corba:raise(#'CosNotifyFilter_ConstraintNotFound'{id=H});
435
435
delete_constraints([], State) ->
436
436
    State;
437
437
delete_constraints([H|T], State) 
438
 
  when record(H, 'CosNotifyFilter_ConstraintInfo') ->
 
438
  when is_record(H, 'CosNotifyFilter_ConstraintInfo') ->
439
439
    case catch ?del_Constraint(State,
440
440
                               H#'CosNotifyFilter_ConstraintInfo'.constraint_id) of
441
441
        {ok, NewState} ->