You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/04/27 05:25:42 UTC
[tomee] 01/02: Restore the sorting order from CXF master branch
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c550d895e974c0d35e5dedb04fbf2a11c467598e
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 20:12:51 2021 -0700
Restore the sorting order from CXF master branch
---
.../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index ffd8083..4b16c1f 100644
--- a/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -896,19 +896,21 @@ public abstract class ProviderFactory {
MessageBodyWriter<?> e1 = p1.getProvider();
MessageBodyWriter<?> e2 = p2.getProvider();
- int result = compareClasses(e1, e2);
- if (result != 0) {
- return result;
- }
List<MediaType> types1 =
JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e1), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
List<MediaType> types2 =
JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e2), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
- result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
+ int result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
if (result != 0) {
return result;
}
+
+ result = compareClasses(e1, e2);
+ if (result != 0) {
+ return result;
+ }
+
result = compareCustomStatus(p1, p2);
if (result != 0) {
return result;