[RESTEASY-2301] Accept header not correctly parsed by org.jboss.resteasy.client.jaxrs.cache.CacheInterceptor

resteasy-client/src/main/java/org/jboss/resteasy/client/jaxrs/cache/CacheInterceptor.java

@@ -206,7 +206,17 @@ else if (exp != null)
 
       byte[] cached = ReadFromStream.readFromStream(1024, response.getEntityStream());
       // if Accept is present, use it, if not fallback to response Content-Type
-      MediaType mediaType = accept != null ? MediaType.valueOf(accept) : MediaType.valueOf(contentType);
+      MediaType mediaType = MediaType.valueOf(contentType);
+      if (accept != null) {
+         for (String acceptItem : accept.split("\\s*,\\s*")) {
+            MediaType acceptMediaType = MediaType.valueOf(acceptItem);
+            if (mediaType.isCompatible(acceptMediaType)) {
+               mediaType = acceptMediaType;
+               break;
+            }
+         }
+      }
+
       final BrowserCache.Entry entry = cache.put(request.getUri().toString(), mediaType,
               response.getHeaders(), cached, expires, etag, lastModified);
 

testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/client/ClientCacheInterceptorTest.java

@@ -231,4 +231,28 @@ public void testCachedValueWithWildCardAccept() throws Exception
       }
    }
 
+
+   @Test
+   // Reproduces RESTEASY-2301
+   public void testCachedValueWithMultipleAccept() throws Exception
+   {
+       BrowserCache cache = new LightweightBrowserCache();
+       CacheInterceptor interceptor = new CacheInterceptor(cache);
+       final String url = generateURL();
+       ClientInvocationBuilder requestA = (ClientInvocationBuilder) client.target(url).register(interceptor).path("echo")
+               .queryParam("msg", "Hello world").request();
+       try (ClientResponse responseA = (ClientResponse) requestA.accept(JSON_NO_CHARSET, XML_NO_CHARSET + ";q=0.5").get())
+      {
+         Assert.assertEquals(Status.OK.getStatusCode(), responseA.getStatus());
+         Assert.assertEquals("Content type must be " + JSON_WITH_CHARSET, JSON_WITH_CHARSET,
+                 responseA.getHeaderString("Content-Type"));
+         Assert.assertNotNull("Cache must contain data", cache.getAny(requestA.getURI().toString()));
+
+         // the response must be cached as json
+         Assert.assertNotNull("Cache must contain data for the given accepted content type",
+                 cache.get(requestA.getURI().toString(), MediaType.APPLICATION_JSON_TYPE));
+
+      }
+   }
+
 }