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 C9D3C102CC for ; Fri, 24 Jan 2014 18:21:21 +0000 (UTC) Received: (qmail 59173 invoked by uid 500); 24 Jan 2014 18:21:20 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 59108 invoked by uid 500); 24 Jan 2014 18:21:20 -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 59091 invoked by uid 99); 24 Jan 2014 18:21:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Jan 2014 18:21:19 +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; Fri, 24 Jan 2014 18:21:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D42B2388994; Fri, 24 Jan 2014 18:20:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1561102 - in /cxf/branches/2.6.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java Date: Fri, 24 Jan 2014 18:20:58 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140124182058.9D42B2388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Fri Jan 24 18:20:58 2014 New Revision: 1561102 URL: http://svn.apache.org/r1561102 Log: Merged revisions 1561100 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ................ r1561100 | sergeyb | 2014-01-24 18:13:34 +0000 (Fri, 24 Jan 2014) | 9 lines Merged revisions 1561097 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1561097 | sergeyb | 2014-01-24 18:10:13 +0000 (Fri, 24 Jan 2014) | 1 line [CXF-5508] Fixing Request.evaluatePreconditions(Date, EntityTag) ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1561100 Merged /cxf/trunk:r1561097 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java?rev=1561102&r1=1561101&r2=1561102&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/impl/RequestImpl.java Fri Jan 24 18:20:58 2014 @@ -287,7 +287,7 @@ public class RequestImpl implements Requ // the ETag conditions do not match, so last modified should be ignored // see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html (section 14.26 for // "If-None-Match", behaviour not specified for "If-Match", section 14.24) - return null; + return rb; } } Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java?rev=1561102&r1=1561101&r2=1561102&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java (original) +++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/impl/RequestImplTest.java Fri Jan 24 18:20:58 2014 @@ -212,6 +212,16 @@ public class RequestImplTest extends Ass } @Test + public void testIfNotMatchAndLastModified() { + metadata.putSingle(HttpHeaders.IF_NONE_MATCH, "1"); + + ResponseBuilder rb = + new RequestImpl(m).evaluatePreconditions(new Date(), new EntityTag("1")); + assertEquals("Precondition must not be met", + 304, rb.build().getStatus()); + } + + @Test public void testEtagsIfNotMatch() { metadata.putSingle(HttpHeaders.IF_NONE_MATCH, "\"123\"");