Skip to content

Commit

Permalink
Fixing logging
Browse files Browse the repository at this point in the history
  • Loading branch information
semancik committed Jun 9, 2017
1 parent fc15041 commit 87b01ba
Showing 1 changed file with 4 additions and 4 deletions.
Expand Up @@ -485,7 +485,7 @@ private static ObjectFilter evaluateFilterExpressionsInternal(ObjectFilter filte
}
} else if (filter instanceof FullTextFilter) {
ExpressionWrapper expressionWrapper = ((FullTextFilter) filter).getExpression();
if (expressionMissing(expressionWrapper, shortDesc)) {
if (expressionMissing(expressionWrapper, filter, shortDesc)) {
return filter.clone();
}
ExpressionType valueExpression = getExpression(expressionWrapper, shortDesc);
Expand Down Expand Up @@ -531,7 +531,7 @@ private static ObjectFilter evaluateFilterExpressionsInternal(ObjectFilter filte
}

ExpressionWrapper expressionWrapper = valueFilter.getExpression();
if (expressionMissing(expressionWrapper, shortDesc)) {
if (expressionMissing(expressionWrapper, filter, shortDesc)) {
return valueFilter.clone();
}
ExpressionType valueExpression = getExpression(expressionWrapper, shortDesc);
Expand Down Expand Up @@ -603,9 +603,9 @@ private static ObjectFilter evaluateFilterExpressionsInternal(ObjectFilter filte
}
}

private static boolean expressionMissing(ExpressionWrapper expressionWrapper, String shortDesc) {
private static boolean expressionMissing(ExpressionWrapper expressionWrapper, ObjectFilter filter, String shortDesc) {
if (expressionWrapper == null || expressionWrapper.getExpression() == null) {
LOGGER.warn("No valueExpression in filter in {}. Returning original filter", shortDesc);
LOGGER.debug("No valueExpression in filter {} in {}. Returning original filter", filter, shortDesc);
return true;
}
return false;
Expand Down

0 comments on commit 87b01ba

Please sign in to comment.