cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [1/2] cxf git commit: [CXF-6369] Updating a test and ConfigurationImpl
Date Fri, 24 Apr 2015 11:28:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 4298cba6d -> 11068eb42


[CXF-6369] Updating a test and ConfigurationImpl


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/11068eb4
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/11068eb4
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/11068eb4

Branch: refs/heads/3.0.x-fixes
Commit: 11068eb42d8598f41fb9632722eac0303be46316
Parents: 1ef051a
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Fri Apr 24 12:27:41 2015 +0100
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Fri Apr 24 12:28:33 2015 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java   | 2 +-
 .../java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/11068eb4/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
index 5333298..57b65c8 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/ConfigurationImpl.java
@@ -141,7 +141,7 @@ public class ConfigurationImpl implements Configuration {
 
     @Override
     public boolean isRegistered(Object obj) {
-        return providers.containsKey(obj);
+        return isRegistered(obj.getClass());
     }
 
     @Override

http://git-wip-us.apache.org/repos/asf/cxf/blob/11068eb4/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
index 21645b2..b5dbd6c 100644
--- a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
+++ b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/ConfigurationImplTest.java
@@ -43,8 +43,10 @@ public class ConfigurationImplTest extends Assert {
         assertFalse(c.isRegistered(ContainerResponseFilter.class));
         assertFalse(c.register(filter, 
                               Collections.<Class<?>, Integer>singletonMap(ContainerResponseFilter.class,
1000)));
+        assertFalse(c.register(ContainerResponseFilterImpl.class, 
+                               Collections.<Class<?>, Integer>singletonMap(ContainerResponseFilter.class,
1000)));
     }
-    private static class ContainerResponseFilterImpl implements ContainerResponseFilter {
+    public static class ContainerResponseFilterImpl implements ContainerResponseFilter {
 
         @Override
         public void filter(ContainerRequestContext requestContext, ContainerResponseContext
responseContext)


Mime
View raw message