Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / src / jalview / ws / rest / HttpResultSet.java

diff --git a/src/jalview/ws/rest/HttpResultSet.java b/src/jalview/ws/rest/HttpResultSet.java
index bff39c1..204e3eb 100644 (file)
--- a/src/jalview/ws/rest/HttpResultSet.java
+++ b/src/jalview/ws/rest/HttpResultSet.java
@@ -20,7 +20,7 @@
  */
 package jalview.ws.rest;
 
-import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.io.FileParse;
 import jalview.io.packed.DataProvider;
 import jalview.io.packed.DataProvider.JvDataType;
@@ -40,6 +40,7 @@ import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.entity.mime.MultipartEntity;
+import org.apache.http.util.EntityUtils;
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.parser.MimeStreamParser;
 
@@ -116,23 +117,22 @@ public class HttpResultSet extends FileParse implements AutoCloseable
     }
     jalview.io.packed.JalviewDataset ds = restJob.newJalviewDataset();
     // Decide how we deal with content.
-    if (en instanceof MultipartEntity)
+    // TODO : verify we are detecting a multipart response correctly
+    if (en.getContentType().getValue().startsWith("multipart/form-data"))
     {
       // Multipart messages should be properly typed, so we parse them as we go.
-      MultipartEntity mpe = (MultipartEntity) en;
-      // multipart
       JalviewMimeContentHandler handler = new JalviewMimeContentHandler(ds);
       MimeStreamParser parser = new MimeStreamParser();
       parser.setContentHandler(handler);
       try
       {
-        parser.parse(mpe.getContent());
+        parser.parse(en.getContent());
       } catch (MimeException me)
       {
         error = true;
         errormessage = "Couldn't parse message from web service.";
-        Cache.warn("Failed to parse MIME multipart content", me);
-        en.consumeContent();
+        Console.warn("Failed to parse MIME multipart content", me);
+        EntityUtils.consume(en);
       }
       return new ParsePackedSet().getAlignment(ds,
               handler.getJalviewDataProviders());
@@ -158,19 +158,19 @@ public class HttpResultSet extends FileParse implements AutoCloseable
               : en.getContentEncoding().getValue();
       if (en.getContentType() != null)
       {
-        Cache.debug("Result Type: " + en.getContentType().toString());
+        Console.debug("Result Type: " + en.getContentType().toString());
       }
       else
       {
-        Cache.debug("No Result Type Specified.");
+        Console.debug("No Result Type Specified.");
       }
       if (enc == null || enc.length() < 1)
       {
-        Cache.debug("Assuming 'Default' Result Encoding.");
+        Console.debug("Assuming 'Default' Result Encoding.");
       }
       else
       {
-        Cache.debug("Result Encoded as : " + enc);
+        Console.debug("Result Encoded as : " + enc);
       }
       // attempt to identify file and construct an appropriate DataSource
       // identifier for it.
@@ -184,9 +184,9 @@ public class HttpResultSet extends FileParse implements AutoCloseable
                 : new InputStreamReader(en.getContent());
       } catch (UnsupportedEncodingException e)
       {
-        Cache.error("Can't handle encoding '" + enc
+        Console.error("Can't handle encoding '" + enc
                 + "' for response from webservice.", e);
-        en.consumeContent();
+        EntityUtils.consume(en);
         error = true;
         errormessage = "Can't handle encoding for response from webservice";
         return;