Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8398A10DF4 for ; Thu, 5 Dec 2013 11:59:14 +0000 (UTC) Received: (qmail 63173 invoked by uid 500); 5 Dec 2013 11:59:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 63053 invoked by uid 500); 5 Dec 2013 11:59:06 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 63046 invoked by uid 99); 5 Dec 2013 11:59:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2013 11:59:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Dec 2013 11:59:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id DA82823889E0; Thu, 5 Dec 2013 11:58:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1548099 - in /cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation: JAXRSBeanValidationInInterceptor.java JAXRSBeanValidationOutInterceptor.java Date: Thu, 05 Dec 2013 11:58:40 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131205115840.DA82823889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu Dec 5 11:58:40 2013 New Revision: 1548099 URL: http://svn.apache.org/r1548099 Log: [CXF-5309] Minor updates to JAX-RS bean validators Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java?rev=1548099&r1=1548098&r2=1548099&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationInInterceptor.java Thu Dec 5 11:58:40 2013 @@ -22,12 +22,14 @@ import java.io.IOException; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; +import javax.ws.rs.ext.Provider; +import org.apache.cxf.interceptor.InterceptorChain; import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.validation.BeanValidationInInterceptor; - +@Provider public class JAXRSBeanValidationInInterceptor extends BeanValidationInInterceptor implements ContainerRequestFilter { public JAXRSBeanValidationInInterceptor() { @@ -43,7 +45,7 @@ public class JAXRSBeanValidationInInterc @Override public void filter(ContainerRequestContext context) throws IOException { - super.handleMessage(PhaseInterceptorChain.getCurrentMessage()); - + InterceptorChain chain = PhaseInterceptorChain.getCurrentMessage().getInterceptorChain(); + chain.add(this); } } Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java?rev=1548099&r1=1548098&r2=1548099&view=diff ============================================================================== --- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java (original) +++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/validation/JAXRSBeanValidationOutInterceptor.java Thu Dec 5 11:58:40 2013 @@ -24,12 +24,13 @@ import javax.ws.rs.container.ContainerRe import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.core.Response; +import javax.ws.rs.ext.Provider; import org.apache.cxf.message.Message; import org.apache.cxf.phase.PhaseInterceptorChain; import org.apache.cxf.validation.BeanValidationOutInterceptor; - +@Provider public class JAXRSBeanValidationOutInterceptor extends BeanValidationOutInterceptor implements ContainerResponseFilter { public JAXRSBeanValidationOutInterceptor() {