honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed error log for null values 

Original commit: elastic/x-pack-elasticsearch@4477fc1c2a
This commit is contained in:
Martijn van Groningen 2014-11-27 10:17:51 +01:00
parent 775f1cb878
commit 29dd1bb888
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/elasticsearch/alerts/actions/AlertActionEntry.java
View File

@ -195,7 +195,9 @@ public class AlertActionEntry implements ToXContent {
historyEntry.endObject(); historyEntry.endObject();
historyEntry.field("request"); historyEntry.field("request");
AlertUtils.writeSearchRequest(searchRequest, historyEntry, params); AlertUtils.writeSearchRequest(searchRequest, historyEntry, params);
historyEntry.field("response", searchResponse); if (searchResponse != null) {
historyEntry.field("response", searchResponse);
}
historyEntry.startObject("actions"); historyEntry.startObject("actions");
for (AlertAction action : actions) { for (AlertAction action : actions) {

6
src/main/java/org/elasticsearch/alerts/actions/AlertActionManager.java
View File

@ -240,11 +240,7 @@ public class AlertActionManager extends AbstractComponent {
throw new ElasticsearchIllegalArgumentException("Unexpected field [" + currentFieldName + "]"); throw new ElasticsearchIllegalArgumentException("Unexpected field [" + currentFieldName + "]");
} }
} else { } else {
if (token == XContentParser.Token.VALUE_NULL) { throw new ElasticsearchIllegalArgumentException("Unexpected token [" + token + "] for [" + currentFieldName + "]");
logger.warn("Got null value for [{}]", currentFieldName);
} else {
throw new ElasticsearchIllegalArgumentException("Unexpected token [" + token + "] for [" + currentFieldName + "]");
}
} }
} }
} catch (IOException e) { } catch (IOException e) {