Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Send at most one condition. #1355

Merged
merged 1 commit into from Jan 30, 2015
Merged

Send at most one condition. #1355

merged 1 commit into from Jan 30, 2015

Conversation

swankjesse
Copy link
Member

Related to #831
Closes: #1354

@JakeWharton
Copy link
Member 

etagAndExpirationDateInThePast(com.squareup.okhttp.UrlConnectionCacheTest)  Time elapsed: 0.101 sec  <<< FAILURE!
java.lang.AssertionError: expected:<Fri, 30 Jan 2015 16:47:23 GMT> but was:<null>
    at org.junit.Assert.fail(Assert.java:88)
    at org.junit.Assert.failNotEquals(Assert.java:743)
    at org.junit.Assert.assertEquals(Assert.java:118)
    at org.junit.Assert.assertEquals(Assert.java:144)
    at com.squareup.okhttp.UrlConnectionCacheTest.etagAndExpirationDateInThePast(UrlConnectionCacheTest.java:720)

@JakeWharton
Copy link
Member

LGTM

swankjesse added a commit that referenced this pull request Jan 30, 2015
@swankjesse
Merge pull request #1355 from square/jwilson_0130_if_none_match
c1a39c9 
Send at most one condition.
@swankjesse swankjesse merged commit c1a39c9 into master Jan 30, 2015
@swankjesse swankjesse deleted the jwilson_0130_if_none_match branch January 30, 2015 23:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Send if-modified-since or if-none-match, but never both
2 participants
@swankjesse @JakeWharton