[cxf] branch 3.1.x-fixes updated: [CXF-7614] Resolving Object subresources when enableStaticResolution is set

[se...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

sergeyb pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


The following commit(s) were added to refs/heads/3.1.x-fixes by this push:
     new 5ab2599  [CXF-7614] Resolving Object subresources when enableStaticResolution is set
5ab2599 is described below

commit 5ab2599700a1e64b7b333a44f66cffa18b42c116
Author: Sergey Beryozkin <sb...@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 61e240b..9f1f126 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" <co...@cxf.apache.org>'].