| commit | 9d0328157695dff1b1c6f2f82ec69a3d17ad06d9 | [log] [tgz] |
|---|---|---|
| author | Simon Nash <nash@apache.org> | Tue Oct 26 19:17:45 2010 +0000 |
| committer | Simon Nash <nash@apache.org> | Tue Oct 26 19:17:45 2010 +0000 |
| tree | 485455b76a073656a36324633366b628dcfc01cc | |
| parent | 5102e1def351b95f516412c2472790bbdb3614de [diff] |
Merge r1025777 TUSCANY-3743: Return correct response code from If-Unmodified-Since git-svn-id: https://svn.apache.org/repos/asf/tuscany/sca-java-1.x/trunk@1027693 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java b/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java index 3975fe1..4765370 100644 --- a/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java +++ b/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
@@ -280,7 +280,7 @@ 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/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java b/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java index fd60ec4..7ddc193 100644 --- a/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java +++ b/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
@@ -290,8 +290,8 @@ 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(); }