cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1503250 - in /cxf/trunk: rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java systests/rs-security/pom.xml
Date Mon, 15 Jul 2013 13:56:20 GMT
Author: sergeyb
Date: Mon Jul 15 13:56:19 2013
New Revision: 1503250

URL: http://svn.apache.org/r1503250
Log:
[CXF-4827] Check if no generator is available when returning a list of prematching filters

Modified:
    cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
    cxf/trunk/systests/rs-security/pom.xml

Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java?rev=1503250&r1=1503249&r2=1503250&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
(original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerProviderFactory.java
Mon Jul 15 13:56:19 2013
@@ -143,6 +143,9 @@ public final class ServerProviderFactory
         List<ProviderInfo<ContainerRequestFilter>> filters, boolean syncNeeded)
{
         ProviderInfo<ContainerRequestFilter> generator = wadlGenerator != null ? wadlGenerator

             : ((ServerProviderFactory)getBaseFactory()).wadlGenerator;
+        if (generator == null) { 
+            return filters;
+        }
         if (filters.size() == 0) {
             return Collections.singletonList(generator);
         } else if (!syncNeeded) {

Modified: cxf/trunk/systests/rs-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/rs-security/pom.xml?rev=1503250&r1=1503249&r2=1503250&view=diff
==============================================================================
--- cxf/trunk/systests/rs-security/pom.xml (original)
+++ cxf/trunk/systests/rs-security/pom.xml Mon Jul 15 13:56:19 2013
@@ -88,11 +88,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-service-description</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
             <version>${project.version}</version>
         </dependency>



Mime
View raw message