aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosNotification/src
diff options
context:
space:
mode:
authorNiclas Eklund <[email protected]>2010-10-28 15:03:38 +0200
committerNiclas Eklund <[email protected]>2010-10-28 15:03:38 +0200
commitbed002dd4303a09c8895a8afc232a1b16874f8ab (patch)
treebe771b682ead00167a27c87d00858e002bdfb597 /lib/cosNotification/src
parentde0ce3407717573e9591b086a1829f16ed88d289 (diff)
parentcaa311d4a2b5fb229d9369c7667b062b34945b36 (diff)
downloadotp-bed002dd4303a09c8895a8afc232a1b16874f8ab.tar.gz
otp-bed002dd4303a09c8895a8afc232a1b16874f8ab.tar.bz2
otp-bed002dd4303a09c8895a8afc232a1b16874f8ab.zip
Merge branch 'maint-r13' into maint-r14
Conflicts: lib/cosNotification/src/CosNotification_Definitions.hrl lib/cosNotification/vsn.mk lib/orber/vsn.mk
Diffstat (limited to 'lib/cosNotification/src')
-rw-r--r--lib/cosNotification/src/cosNotification_Filter.erl32
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/cosNotification/src/cosNotification_Filter.erl b/lib/cosNotification/src/cosNotification_Filter.erl
index dd3b5beb93..7201f7d6e2 100644
--- a/lib/cosNotification/src/cosNotification_Filter.erl
+++ b/lib/cosNotification/src/cosNotification_Filter.erl
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2009. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2010. 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
@@ -877,9 +877,9 @@ check_wildcard(Types, Which, WC, Domain, Type) ->
end,
check_types(Types, Which, NewWC).
-%% Change '*' to '.*', see regexp:parse/2 documentation.
+%% Change '*' to '.*', see re:compile/1 documentation.
convert_wildcard([], Acc) ->
- case regexp:parse(lists:reverse(Acc)) of
+ case re:compile(lists:reverse(Acc)) of
{ok, Expr} ->
Expr;
_ ->
@@ -900,37 +900,37 @@ match_types(_, _, []) ->
false;
match_types(Domain, Type, [{domain, WCDomain, Type}|T]) ->
L=length(Domain),
- case catch regexp:matches(Domain, WCDomain) of
- {match, []} ->
+ case catch re:run(Domain, WCDomain) of
+ nomatch ->
match_types(Domain, Type, T);
- {match, [{1, L}]} ->
+ {match, [{0, L}]} ->
true;
_->
match_types(Domain, Type, T)
end;
match_types(Domain, Type, [{type, Domain, WCType}|T]) ->
L=length(Type),
- case catch regexp:matches(Type, WCType) of
- {match, []} ->
+ case catch re:run(Type, WCType) of
+ nomatch ->
match_types(Domain, Type, T);
- {match, [{1, L}]} ->
+ {match, [{0, L}]} ->
true;
_->
match_types(Domain, Type, T)
end;
match_types(Domain, Type, [{both, WCDomain, WCType}|T]) ->
L1=length(Domain),
- case catch regexp:matches(Domain, WCDomain) of
- {match, []} ->
+ case catch re:run(Domain, WCDomain) of
+ nomatch ->
match_types(Domain, Type, T);
- {match, [{1, L1}]} ->
+ {match, [{0, L1}]} ->
L2=length(Type),
- case catch regexp:matches(Type, WCType) of
- {match, []} ->
+ case catch re:run(Type, WCType) of
+ nomatch ->
match_types(Domain, Type, T);
- {match, [{1, L2}]} ->
+ {match, [{0, L2}]} ->
true;
- _->
+ _ ->
match_types(Domain, Type, T)
end;
_->