From 1be46776e563f58046f9e690393696021cff531f Mon Sep 17 00:00:00 2001 From: ThePizzle Date: Wed, 8 Jun 2011 17:15:53 -0400 Subject: [PATCH 1/2] Set timeout parameters in doSend() to avoid NPE --- src/main/java/org/scribe/model/Request.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java index b3a7c66..66aaea2 100644 --- a/src/main/java/org/scribe/model/Request.java +++ b/src/main/java/org/scribe/model/Request.java @@ -28,6 +28,8 @@ class Request private String charset; private byte[] bytePayload = null; private boolean connectionKeepAlive = false; + private Long connectTimeout = null; + private Long readTimeout = null; /** * Creates a new Http Request @@ -76,6 +78,12 @@ class Request Response doSend() throws IOException { connection.setRequestMethod(this.verb.name()); + if (connectTimeout != null) { + connection.setConnectTimeout(connectTimeout.intValue()); + } + if (readTimeout != null) { + connection.setReadTimeout(readTimeout.intValue()); + } addHeaders(connection); if (verb.equals(Verb.PUT) || verb.equals(Verb.POST)) { @@ -278,7 +286,8 @@ class Request */ public void setConnectTimeout(int duration, TimeUnit unit) { - this.connection.setConnectTimeout((int) unit.toMillis(duration)); + this.connectTimeout = unit.toMillis(duration); + //this.connection.setConnectTimeout((int) unit.toMillis(duration)); } /** @@ -290,7 +299,8 @@ class Request */ public void setReadTimeout(int duration, TimeUnit unit) { - this.connection.setReadTimeout((int) unit.toMillis(duration)); + this.readTimeout = unit.toMillis(duration); + //this.connection.setReadTimeout((int) unit.toMillis(duration)); } /** From 10c56bda271413a8dd8967afdda57257c53d9df9 Mon Sep 17 00:00:00 2001 From: ThePizzle Date: Thu, 9 Jun 2011 09:23:33 -0400 Subject: [PATCH 2/2] Fix indentation and remove commented code --- src/main/java/org/scribe/model/Request.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/scribe/model/Request.java b/src/main/java/org/scribe/model/Request.java index 66aaea2..a9c332a 100644 --- a/src/main/java/org/scribe/model/Request.java +++ b/src/main/java/org/scribe/model/Request.java @@ -78,11 +78,13 @@ class Request Response doSend() throws IOException { connection.setRequestMethod(this.verb.name()); - if (connectTimeout != null) { - connection.setConnectTimeout(connectTimeout.intValue()); + if (connectTimeout != null) + { + connection.setConnectTimeout(connectTimeout.intValue()); } - if (readTimeout != null) { - connection.setReadTimeout(readTimeout.intValue()); + if (readTimeout != null) + { + connection.setReadTimeout(readTimeout.intValue()); } addHeaders(connection); if (verb.equals(Verb.PUT) || verb.equals(Verb.POST)) @@ -287,7 +289,6 @@ class Request public void setConnectTimeout(int duration, TimeUnit unit) { this.connectTimeout = unit.toMillis(duration); - //this.connection.setConnectTimeout((int) unit.toMillis(duration)); } /** @@ -300,7 +301,6 @@ class Request public void setReadTimeout(int duration, TimeUnit unit) { this.readTimeout = unit.toMillis(duration); - //this.connection.setReadTimeout((int) unit.toMillis(duration)); } /**