svn commit: r1724530 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java

[ma...@apache.org]

Author: markrmiller
Date: Wed Jan 13 23:59:03 2016
New Revision: 1724530

URL: http://svn.apache.org/viewvc?rev=1724530&view=rev
Log:
SOLR-8453: Only consume input here if exp != null, otherwise it is done in writeResponse.

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/   (props changed)
    lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java

Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java?rev=1724530&r1=1724529&r2=1724530&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java Wed Jan 13 23:59:03 2016
@@ -623,19 +623,19 @@ public class HttpSolrCall {
       exp = e;
     } finally {
       try {
-        try {
-          if (exp != null) {
+        if (exp != null) {
+          try {
             SimpleOrderedMap info = new SimpleOrderedMap();
             int code = ResponseUtils.getErrorInfo(ex, info, log);
             sendError(code, info.toString());
-          }
-        } finally {
-          if (core == null && localCore != null) {
-            localCore.close();
+          } finally {
+            consumeInput(req);
           }
         }
       } finally {
-        consumeInput(req);
+        if (core == null && localCore != null) {
+          localCore.close();
+        }
       }
     }
   }