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 2018/01/29 10:41:38 UTC
lucene-solr git commit: SOLR-11879: avoid EOFException when content is send without a payload
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 8c8d78a4b -> 2c2149862
SOLR-11879: avoid EOFException when content is send without a payload
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2c214986
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2c214986
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2c214986
Branch: refs/heads/branch_7x
Commit: 2c21498621426861393358b5da85195e0caafa48
Parents: 8c8d78a
Author: Noble Paul <no...@apache.org>
Authored: Mon Jan 29 21:41:22 2018 +1100
Committer: Noble Paul <no...@apache.org>
Committed: Mon Jan 29 21:41:22 2018 +1100
----------------------------------------------------------------------
.../apache/solr/handler/loader/JavabinLoader.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2c214986/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
index 870737a..4264476 100644
--- a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
+++ b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java
@@ -16,6 +16,13 @@
*/
package org.apache.solr.handler.loader;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
import org.apache.solr.client.solrj.request.JavaBinUpdateRequestCodec;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.SolrException;
@@ -32,13 +39,6 @@ import org.apache.solr.update.AddUpdateCommand;
import org.apache.solr.update.DeleteUpdateCommand;
import org.apache.solr.update.processor.UpdateRequestProcessor;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
/**
* Update handler which uses the JavaBin format
*
@@ -103,6 +103,7 @@ public class JavabinLoader extends ContentStreamLoader {
}
};
FastInputStream in = FastInputStream.wrap(stream);
+ if (in.peek() == -1) return;
for (; ; ) {
try {
update = new JavaBinUpdateRequestCodec().unmarshal(in, handler);