From b47acbe16f56453ba9580f5f95034afefa445ea0 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 26 Oct 2010 19:26:08 +0000 Subject: TUSCANY-3743: Return correct response code from If-Unmodified-Since (merged 1.x commit r1027693) git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027695 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java | 2 +- .../tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sca-java-2.x/trunk/modules/binding-atom-runtime') diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java index f2ad84bfd5..0b534502e0 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java @@ -281,7 +281,7 @@ class AtomBindingListenerServlet extends HttpServlet { Date predicateDate = dateFormat.parse( predicate ); if ( predicateDate.compareTo( exactSeconds(feedUpdated) ) < 0 ) { // Match, should short circuit - response.sendError(HttpServletResponse.SC_NOT_MODIFIED); + response.sendError(HttpServletResponse.SC_PRECONDITION_FAILED); return; } } catch ( java.text.ParseException e ) { diff --git a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java index 89f182b7fc..932344649f 100644 --- a/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java +++ b/sca-java-2.x/trunk/modules/binding-atom-runtime/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java @@ -301,8 +301,8 @@ public class ProviderFeedEntityTagsTestCase { ClientResponse res = client.get(providerURI, opts); Assert.assertNotNull(res); try { - // Should return 304 - Feed not provided since feed is modified since. - Assert.assertEquals(304, res.getStatus()); + // Should return 412 - Feed not provided since feed is modified since. + Assert.assertEquals(412, res.getStatus()); } finally { res.release(); } -- cgit v1.2.3