Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Merge branch 'master' into 1758-timeout-as-long
  • Loading branch information
wumpz authored Apr 27, 2023
commit c7c727a81a52a3d105b45b1eb7e68c8dc34b46f3
2 changes: 2 additions & 0 deletions src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ public Statement call() throws Exception {
executorService.shutdown();

statement = future.get( parser.getConfiguration().getAsLong(Feature.timeOut), TimeUnit.MILLISECONDS);

} catch (TimeoutException ex) {
parser.interrupted = true;
throw new JSQLParserException("Time out occurred.", ex);
Expand Down Expand Up @@ -335,6 +336,7 @@ public Statements call() throws Exception {
executorService.shutdown();

statements = future.get( parser.getConfiguration().getAsLong(Feature.timeOut) , TimeUnit.MILLISECONDS);

} catch (TimeoutException ex) {
parser.interrupted = true;
throw new JSQLParserException("Time out occurred.", ex);
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.