ObjFW  Diff

Differences From Artifact [5bea1d2dbc]:

To Artifact [fc85a500ca]:

  • File src/exceptions/OFHTTPRequestFailedException.m — part of check-in [3d16a30f41] at 2013-06-22 12:12:36 on branch trunk — Rework exceptions.

    This mostly removes the argument for the class in which the exception
    occurred. As backtraces were recently added for all platforms, the
    passed class does not give any extra information on where the exception
    occurred anymore.

    This also removes a few other arguments which were not too helpful. In
    the past, the idea was to pass as many arguments as possible so that it
    is easier to find the origin of the exception. However, as backtraces
    are a much better way to find the origin, those are not useful anymore
    and just make the exception more cumbersome to use. The rule is now to
    only pass arguments that might help in recovering from the exception or
    provide information that is otherwise not easily accessible. (user: js, size: 1909) [annotate] [blame] [check-ins using]


22
23
24
25
26
27
28
29

30
31

32
33

34
35

36
37
38

39
40
41
42
43
44
45
46
47
48
49
50
51
52


53
54

55
56
57
58
59
60
61
22
23
24
25
26
27
28

29


30
31

32


33
34
35

36
37
38
39
40
41
42
43
44
45
46
47



48
49
50

51
52
53
54
55
56
57
58







-
+
-
-
+

-
+
-
-
+


-
+











-
-
-
+
+

-
+







#import "OFString.h"
#import "OFHTTPRequest.h"
#import "OFHTTPRequestReply.h"

#import "common.h"

@implementation OFHTTPRequestFailedException
+ (instancetype)exceptionWithClass: (Class)class
+ (instancetype)exceptionWithRequest: (OFHTTPRequest*)request
			   request: (OFHTTPRequest*)request
			     reply: (OFHTTPRequestReply*)reply
			       reply: (OFHTTPRequestReply*)reply
{
	return [[[self alloc] initWithClass: class
	return [[[self alloc] initWithRequest: request
				    request: request
				      reply: reply] autorelease];
					reply: reply] autorelease];
}

- initWithClass: (Class)class
- init
{
	@try {
		[self doesNotRecognizeSelector: _cmd];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	abort();
}

- initWithClass: (Class)class
	request: (OFHTTPRequest*)request
	  reply: (OFHTTPRequestReply*)reply
- initWithRequest: (OFHTTPRequest*)request
	    reply: (OFHTTPRequestReply*)reply
{
	self = [super initWithClass: class];
	self = [super init];

	_request = [request retain];
	_reply = [reply retain];

	return self;
}

80
81
82
83
84
85
86
87
88


89
90
91
92
93
94
95
96
97
98
99
100
77
78
79
80
81
82
83


84
85
86
87
88
89
90
91
92
93
94
95
96
97







-
-
+
+












		break;
	case OF_HTTP_REQUEST_TYPE_POST:
		type = "POST";
		break;
	}

	return [OFString stringWithFormat:
	    @"A HTTP %s request in class %@ with URL %@ failed with code %d",
	    type, _inClass, [_request URL], [_reply statusCode]];
	    @"A HTTP %s request with URL %@ failed with code %d!", type,
	    [_request URL], [_reply statusCode]];
}

- (OFHTTPRequest*)request
{
	OF_GETTER(_request, false)
}

- (OFHTTPRequestReply*)reply
{
	OF_GETTER(_reply, false)
}
@end