Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ISSUE-#4594,#4596] Fix IO close problem #4606

Merged
merged 1 commit into from
Dec 31, 2020

Conversation

Maijh97
Copy link
Collaborator

@Maijh97 Maijh97 commented Dec 30, 2020

Please do not create a Pull Request without creating an issue first.

What is the purpose of the change

fix: #4594 #4596

Brief changelog

XX

Verifying this change

XXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a Github issue filed for the change (usually before you start working on it). Trivial changes like typos do not require a Github issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [ISSUE #123] Fix UnknownException when host config not exist. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn -B clean package apache-rat:check findbugs:findbugs -Dmaven.test.skip=true to make sure basic checks pass. Run mvn clean install -DskipITs to make sure unit-test pass. Run mvn clean test-compile failsafe:integration-test to make sure integration-test pass.

@Maijh97 Maijh97 changed the title [ISSUE-#4594,#4594] Fix IO close problem [ISSUE-#4594,#4596] Fix IO close problem Dec 30, 2020
@Maijh97 Maijh97 linked an issue Dec 30, 2020 that may be closed by this pull request
@@ -249,21 +248,15 @@ public void setHealthStatus(String healthStatus) {
* @throws Exception Exception.
*/
private void execute(Connection conn, String sqlFile) throws Exception {
Statement stmt = null;
try {
try (Statement stmt = conn.createStatement()) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this grammar supported after 1.7 JDK. I remember 1.X version client is 1.6JDK

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Support JDK 7. This syntax is only used on the server side.

@KomachiSion KomachiSion added this to the 1.4.1 milestone Dec 31, 2020
@KomachiSion KomachiSion merged commit 2af6784 into alibaba:develop Dec 31, 2020
wjm0729 added a commit to wjm0729/nacos that referenced this pull request Dec 31, 2020
…op-import-v2

* 'develop' of https://github.com/alibaba/nacos:
  优化 FileTypeEnum 取值逻辑, 避免使用异常当作逻辑分支 (alibaba#4607)
  for alibaba#4594,alibaba#4594 Fix IO close problem. (alibaba#4606)
  console-ui config排序优化 (alibaba#4599)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants