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:18 UTC
[tomee-jakarta] 01/04: Restore sorting from master branch. Disable
patching of org.apache.cxf.jaxrs for now
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-jakarta.git
commit 348d1ac3612f8b9c74ee90104c44fdee0994c619
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 20:55:59 2021 -0700
Restore sorting from master branch. Disable patching of org.apache.cxf.jaxrs for now
---
tomee/tomee-plume-webapp/pom.xml | 3 +++
.../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 12 +++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index f402748..b75c3d9 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -469,6 +469,9 @@
<source>${project.basedir}/../../transform/src/patch/java/</source>
<!-- <source>${project.basedir}/src/patch/java/</source>-->
</patchSources>
+ <sourceExcludes>
+ <exclude>org/apache/cxf/jaxrs</exclude>
+ </sourceExcludes>
<replace>
<!-- We don't want these bytecode modified at all, so we overwrite
any modifications made by the Eclipse Transformer with the originals -->
diff --git a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index 3963b5b..cabe51c 100644
--- a/transform/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/transform/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;