You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/10/21 00:09:15 UTC
svn commit: r1025777 - in
/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src:
main/java/org/apache/tuscany/sca/binding/atom/provider/
test/java/org/apache/tuscany/sca/binding/atom/
Author: nash
Date: Wed Oct 20 22:09:15 2010
New Revision: 1025777
URL: http://svn.apache.org/viewvc?rev=1025777&view=rev
Log:
TUSCANY-3743: Return correct response code from If-Unmodified-Since
Modified:
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java?rev=1025777&r1=1025776&r2=1025777&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/main/java/org/apache/tuscany/sca/binding/atom/provider/AtomBindingListenerServlet.java Wed Oct 20 22:09:15 2010
@@ -280,7 +280,7 @@ class AtomBindingListenerServlet extends
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 ) {
Modified: tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java?rev=1025777&r1=1025776&r2=1025777&view=diff
==============================================================================
--- tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java (original)
+++ tuscany/sca-java-1.x/branches/sca-java-1.6.1/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/ProviderFeedEntityTagsTestCase.java Wed Oct 20 22:09:15 2010
@@ -290,8 +290,8 @@ public class ProviderFeedEntityTagsTestC
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();
}