Changeset 7484

Timestamp:

May 17, 2018, 8:46:09 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2118: The "freegeoip" setting should be disabled by default

This fixes the problem with the Content-Type header. It should now accept all answers that contain application/json data.

File:

• branches/3.12-stable/src/core/net/sf/basedb/util/GeoLocation.java (modified) (1 diff)

branches/3.12-stable/src/core/net/sf/basedb/util/GeoLocation.java

@@ -240 +240 @@
       
       HttpEntity entity = response.getEntity();
-      Header contentType = entity.getContentType();
-      if (contentType != null && !"application/json".equals(contentType.getValue()))
-      {
-        throw new RuntimeException("Unexpected content type: "+contentType.getValue());
+      Header contentTypeHeader = entity.getContentType();
+      String contentType = contentTypeHeader != null ? contentTypeHeader.getValue() : null;
+      if (contentType != null && !contentType.contains("application/json"))
+      {
+        throw new RuntimeException("Unexpected content type: "+contentType);
       }