From bff4ab0cd995ba791f49cf91bc5a441af9a200cc Mon Sep 17 00:00:00 2001
From: Mark Robert Miller <markrmiller@apache.org>
Date: Wed, 13 Jan 2016 23:58:06 +0000
Subject: [PATCH] SOLR-8453: Only consume input here if exp != null, otherwise
 it is done in writeResponse.

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1724529 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/solr/servlet/HttpSolrCall.java | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
index 0c24abc81c8..837eb16073e 100644
--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
@@ -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();
+        }
       }
     }
   }