From 6c9f9282a4128828935410540d99faae793cee17 Mon Sep 17 00:00:00 2001 From: nash Date: Tue, 26 Oct 2010 19:17:45 +0000 Subject: Merge r1025777 TUSCANY-3743: Return correct response code from If-Unmodified-Since git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027693 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-1.x/trunk') diff --git a/sca-java-1.x/trunk/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/sca-java-1.x/trunk/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java index 3975fe1220..4765370a9c 100644 --- a/sca-java-1.x/trunk/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java +++ b/sca-java-1.x/trunk/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java @@ -280,7 +280,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-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java index fd60ec447e..7ddc193bdc 100644 --- a/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java +++ b/sca-java-1.x/trunk/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java @@ -290,8 +290,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