manticore 0.6.2-java → 0.6.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e7c6c63c54c59317eb836e5caa6cc1dbb08fc1
-  data.tar.gz: 362d618ee0a1e92762bd5acbb9639c0ea18af0e9
+  metadata.gz: 8b96d1eb1f7f1e5b6885a5f08e24ba394ac9fac0
+  data.tar.gz: 1ff15070f745905119d536ae7df328ce845990a6
 SHA512:
-  metadata.gz: ab0c5c529908001ac420bc3c82234ff9016139024211dc2e1e9111dc71e43b37b6ce92c674a5b67c270329de752e3d33fc9e8cb726246a792bdc060e02bb3881
-  data.tar.gz: 1aa799e26509c9e0ce51be46b5cf3f156bd0bfc33f9ecc8a41c136a039f2547ef8e8d0ad479afcfd69a34b6d0fbdb7525e670d65c8c594e51d50a4c53a04a62f
+  metadata.gz: 1f08d3632cbe683ce2456e4cde41d05545bdf5926992067f06f25af1477d9a31bac90d797a88a4f4d4a7a56477afd9f725981958ac3082e501c18199da4875b3
+  data.tar.gz: d2231b58a53b86bd77af5c2f27f79d9a4ece0d72cffbace8c1a830fefcd33a84f5c710f93d1e55e76637ab48d5966c79f466ee40c911418a59e4ce440576a8c7

data/ext/manticore/org/manticore/Manticore.java

@@ -39,14 +39,19 @@ public class Manticore implements Library {
     @JRubyMethod(name = "read_entity")
     public IRubyObject readEntity(ThreadContext context, IRubyObject rEntity, Block block) throws IOException {
       HttpEntity entity = (HttpEntity)rEntity.toJava(HttpEntity.class);
+
       String charset = EntityUtils.getContentCharSet(entity);
-      if(charset == null) { charset = HTTP.DEFAULT_CONTENT_CHARSET; }
-      Encoding encoding;
-      try {
+      if (charset == null) {
         String mimeType = EntityUtils.getContentMimeType(entity);
-        if (mimeType.startsWith("application/json")) {
+        if ( mimeType != null && mimeType.startsWith("application/json") ) {
           charset = "UTF-8";
+        } else {
+          charset = HTTP.DEFAULT_CONTENT_CHARSET;
         }
+      }
+
+      Encoding encoding;
+      try {
         encoding = context.getRuntime().getEncodingService().getEncodingFromString(charset);
       } catch(Throwable e) {
         encoding = context.getRuntime().getEncodingService().getEncodingFromString(HTTP.DEFAULT_CONTENT_CHARSET);

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: java
 authors:
 - Chris Heald