You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/10/31 06:03:18 UTC
lucene-solr:branch_7x: SOLR-11380: use the inNull() method to check
for empty UpdateRequest
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 4b316ec13 -> dd56f5ca8
SOLR-11380: use the inNull() method to check for empty UpdateRequest
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dd56f5ca
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dd56f5ca
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dd56f5ca
Branch: refs/heads/branch_7x
Commit: dd56f5ca845bb06c2621188fe9a1e20bdec5e25d
Parents: 4b316ec
Author: Noble Paul <no...@apache.org>
Authored: Tue Oct 31 16:33:08 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Oct 31 16:33:08 2017 +1030
----------------------------------------------------------------------
.../solr/client/solrj/impl/BinaryRequestWriter.java | 14 ++------------
.../solr/client/solrj/request/RequestWriter.java | 2 +-
2 files changed, 3 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd56f5ca/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
index 1f32e07..ee961ef 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/BinaryRequestWriter.java
@@ -40,12 +40,7 @@ public class BinaryRequestWriter extends RequestWriter {
public ContentWriter getContentWriter(SolrRequest req) {
if (req instanceof UpdateRequest) {
UpdateRequest updateRequest = (UpdateRequest) req;
- if (isNull(updateRequest.getDocuments()) &&
- isNull(updateRequest.getDeleteByIdMap()) &&
- isNull(updateRequest.getDeleteQuery())
- && (updateRequest.getDocIterator() == null)) {
- return null;
- }
+ if (isEmpty(updateRequest)) return null;
return new ContentWriter() {
@Override
public void write(OutputStream os) throws IOException {
@@ -66,12 +61,7 @@ public class BinaryRequestWriter extends RequestWriter {
public Collection<ContentStream> getContentStreams(SolrRequest req) throws IOException {
if (req instanceof UpdateRequest) {
UpdateRequest updateRequest = (UpdateRequest) req;
- if (isNull(updateRequest.getDocuments()) &&
- isNull(updateRequest.getDeleteByIdMap()) &&
- isNull(updateRequest.getDeleteQuery())
- && (updateRequest.getDocIterator() == null) ) {
- return null;
- }
+ if (isEmpty(updateRequest) ) return null;
throw new RuntimeException("This Should not happen");
} else {
return super.getContentStreams(req);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dd56f5ca/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
index 8cefa0b..d83ca91 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/RequestWriter.java
@@ -73,7 +73,7 @@ public class RequestWriter {
return req.getContentStreams();
}
- private boolean isEmpty(UpdateRequest updateRequest) {
+ protected boolean isEmpty(UpdateRequest updateRequest) {
return isNull(updateRequest.getDocuments()) &&
isNull(updateRequest.getDeleteByIdMap()) &&
isNull(updateRequest.getDeleteQuery()) &&