Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-29 07:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-94 - upgrade to latest elasticsearch 1.3.2 driver

Browse Source
This commit is contained in:
Mohsin Husen 2014-08-17 09:50:55 +01:00
parent 097c5f68ce
commit 479a670e2f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -23,7 +23,7 @@
<commonscollections>3.2.1</commonscollections>
<commonslang>2.6</commonslang>
<elasticsearch>1.2.2</elasticsearch>
<elasticsearch>1.3.2</elasticsearch>
<springdata.commons>1.9.0.BUILD-SNAPSHOT</springdata.commons>
</properties>

2
src/main/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplate.java
View File

@ -399,7 +399,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
if (query.DoUpsert()) {
updateRequestBuilder.setDocAsUpsert(true)
.setDoc(query.getUpdateRequest().doc())
.setScript(query.getUpdateRequest().script())
.setScript(query.getUpdateRequest().script(), query.getUpdateRequest().scriptType())
.setScriptParams(query.getUpdateRequest().scriptParams())
.setScriptLang(query.getUpdateRequest().scriptLang());
} else {