Skip to content

Commit 9271d28

Browse files
committed
Merge pull request #335 from paulkrause88/master
timeout attribute description
2 parents 79d36b2 + 65a2b5c commit 9271d28

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

src/site/xdoc/sqlmap-xml.xml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,11 @@ ps.setInt(1,id);]]></source>
201201
</tr>
202202
<tr>
203203
<td><code>timeout</code></td>
204-
<td>This sets the number of seconds the driver will wait for the database to return from a
205-
request, before throwing an exception. Default is <code>unset</code> (driver dependent).
204+
<td>This sets the number of <em>milli</em>seconds the driver will wait for the database
205+
to return from a request before throwing an exception.
206+
If the <a href="configuration.html#settings"><code>defaultStatementTimeout</code></a>
207+
(which is calibrated in seconds) has been set, <code>timeout</code> defaults to 1000
208+
times that value. Otherwise, the default is <code>unset</code> (driver dependent).
206209
</td>
207210
</tr>
208211
<tr>
@@ -316,8 +319,11 @@ ps.setInt(1,id);]]></source>
316319
</tr>
317320
<tr>
318321
<td><code>timeout</code></td>
319-
<td>This sets the maximum number of seconds the driver will wait for the database to return from a
320-
request, before throwing an exception. Default is <code>unset</code> (driver dependent).
322+
<td>This sets the number of <em>milli</em>seconds the driver will wait for the database
323+
to return from a request before throwing an exception.
324+
If the <a href="configuration.html#settings"><code>defaultStatementTimeout</code></a>
325+
(which is calibrated in seconds) has been set, <code>timeout</code> defaults to 1000
326+
times that value. Otherwise, the default is <code>unset</code> (driver dependent).
321327
</td>
322328
</tr>
323329
<tr>

0 commit comments

Comments
 (0)