cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [cxf] 01/02: [CXF-7614] Resolving Object subresources when enableStaticResolution is set
Date Fri, 19 Jan 2018 13:02:00 GMT
This is an automated email from the ASF dual-hosted git repository.

sergeyb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 8c85660cd1d6f479722bbc0c5dab0ebce9a9c554
Author: Sergey Beryozkin <sberyozkin@gmail.com>
AuthorDate: Fri Jan 19 13:00:49 2018 +0000

    [CXF-7614] Resolving Object subresources when enableStaticResolution is set
---
 .../src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
index 8b6ffad..3512e43 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
@@ -140,7 +140,7 @@ public class ClassResourceInfo extends BeanResourceInfo {
     }
 
     public ClassResourceInfo getSubResource(Class<?> typedClass, Class<?> instanceClass,
Object instance) {
-        instanceClass = enableStatic ? typedClass : instanceClass;
+        instanceClass = enableStatic && typedClass != Object.class ? typedClass :
instanceClass;
         return getSubResource(typedClass, instanceClass, instance, enableStatic, JAXRSUtils.getCurrentMessage());
     }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@cxf.apache.org" <commits@cxf.apache.org>.

Mime
View raw message