Author: toad Date: 2008-04-05 13:46:59 +0000 (Sat, 05 Apr 2008) New Revision: 19025
Modified:
trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
Log:
Trivial refactoring, avoid code duplication. Thanks Daniel Cheng.
Modified: trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2008-04-05 13:44:31 UTC (rev 19024)
+++ trunk/freenet/src/freenet/clients/http/ToadletContextImpl.java
2008-04-05 13:46:59 UTC (rev 19025)
@@ -337,38 +337,28 @@
break;
}
+ HTTPRequestImpl req = new
HTTPRequestImpl(uri, data, ctx);
+ try {
if(method.equals("GET")) {
- try {
- t.handleGet(uri, new
HTTPRequestImpl(uri), ctx);
+ t.handleGet(uri, req,
ctx);
ctx.close();
- } catch (RedirectException re) {
- uri = re.newuri;
- redirect = true;
- }
} else if(method.equals("PUT")) {
- try {
t.handlePut(uri, ctx);
ctx.close();
- } catch (RedirectException re) {
- uri = re.newuri;
- redirect = true;
- }
} else if(method.equals("POST")) {
- try {
- HTTPRequestImpl req =
new HTTPRequestImpl(uri, data, ctx);
t.handlePost(uri, req,
ctx);
req.freeParts();
- } catch (RedirectException re) {
- uri = re.newuri;
- redirect = true;
- }
} else {
ctx.sendMethodNotAllowed(method, ctx.shouldDisconnect);
ctx.close();
}
+ } catch (RedirectException re) {
+ uri = re.newuri;
+ redirect = true;
+ }
}
if(ctx.shouldDisconnect) {
sock.close();
