Permalink
Browse files

fix dyn_variable settings bug (caused by bad merges)

  • Loading branch information...
nniclausse committed Sep 7, 2012
1 parent 45c9c46 commit 5a86dc08d9eea1bec7f24903bccb5fd1a0e033b3
Showing with 6 additions and 6 deletions.
  1. +6 −6 src/tsung_controller/ts_config.erl
@@ -519,16 +519,16 @@ parse(#xmlElement{name=dyn_variable, attributes=Attrs},
DefaultRegExp = ?DEF_RE_DYNVAR_BEGIN ++ StrName
++?DEF_RE_DYNVAR_END,
{re,DefaultRegExp};
- {none,none,none,XPath,none} ->
- {xpath,XPath};
- {none,none,none,none,JSONPath} ->
- {jsonpath,JSONPath};
+ {RE,none,none,none, none} ->
+ {re,RE};
{none,PG,none,none, none} ->
{pgsql_expr,PG};
+ {none,none,XPath,none,none} ->
+ {xpath,XPath};
{none,none,none,AuthHeader,none} ->
{header, AuthHeader};
- {RE,none,none,none, none} ->
- {re,RE}
+ {none,none,none,none,JSONPath} ->
+ {jsonpath,JSONPath}
end,
FlattenExpr =lists:flatten(Expr),
%% precompilation of the exp

0 comments on commit 5a86dc0

Please sign in to comment.