Merge branch 'stream-rl-fix' of https://github.com/sptramer/AFNetworking into sptramer-stream-rl-fix

Conflicts: AFNetworking/AFURLConnectionOperation.m
2012-09-14 10:52:55 -07:00 · 2012-09-14 10:52:55 -07:00 · 42fecdc138
commit 42fecdc138
parent b8dff45fd8 9ffd2226b3
1 changed files with 1 additions and 1 deletions
--- a/AFNetworking/AFURLConnectionOperation.m
+++ b/AFNetworking/AFURLConnectionOperation.m
@ -257,7 +257,7 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
 }

 - (void)setOutputStream:(NSOutputStream *)outputStream {
-    if (_outputStream == outputStream) {
+    if (outputStream == _outputStream) {
        return;
    }