Changeset 5458 for OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java

Timestamp:

07/08/14 11:50:40 (10 years ago)

Author:

Oliver Schonefeld

Message:

• clean up pom.xml
• update some dependencies
• update to Apache Http Client 4.3.x

File:

• OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java (modified) (5 diffs)

OAIHarvester/trunk/OAIHarvester/src/main/java/eu/clarin/cmdi/oai/harvester/impl/Response.java

@@ -19 +19 @@
 
 import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.utils.HttpClientUtils;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
 import org.codehaus.stax2.XMLStreamReader2;
 import org.slf4j.Logger;
@@ -84 +82 @@
     private static final Logger logger =
             LoggerFactory.getLogger(Response.class);
-    private final HttpResponse response;
+    private final CloseableHttpResponse response;
     private final long now = System.currentTimeMillis();
     private final CountingInputStream stream;
@@ -90 +88 @@
 
 
-    Response(HarvestJobImpl job, HttpResponse response, AbstractHarvester harvester)
+    Response(HarvestJobImpl job, CloseableHttpResponse response, AbstractHarvester harvester)
             throws IOException, XMLStreamException, HarvesterException {
         if (job == null) {
@@ -165 +163 @@
         }
 
-        /*
-         * try hard to release HTTP client resources ...
-         */
+        /* make sure to release allocated resources */
         try {
-            EntityUtils.consume(response.getEntity());
-        } catch (IOException ex) {
+            response.close();
+        } catch (IOException e) {
             /* IGNORE */
         }
-
-        /* make sure to release allocated resources */
-        HttpClientUtils.closeQuietly(response);
     }
 
@@ -382 +375 @@
         while (reader.isCharacters()) {
             String s = reader.getText();
-            if (s != null) {
+            if ((s != null) && !s.isEmpty()) {
                 sb.append(s);
             }