From commits-return-6839-archive-asf-public=cust-asf.ponee.io@trafodion.apache.org Sun Feb 4 02:22:12 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 29956180621 for ; Sun, 4 Feb 2018 02:22:12 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 18B77160C59; Sun, 4 Feb 2018 01:22:12 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5F766160C38 for ; Sun, 4 Feb 2018 02:22:11 +0100 (CET) Received: (qmail 87861 invoked by uid 500); 4 Feb 2018 01:22:10 -0000 Mailing-List: contact commits-help@trafodion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: commits@trafodion.apache.org Delivered-To: mailing list commits@trafodion.apache.org Received: (qmail 87852 invoked by uid 99); 4 Feb 2018 01:22:10 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Feb 2018 01:22:10 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6DBFFE9434; Sun, 4 Feb 2018 01:22:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: liuming@apache.org To: commits@trafodion.apache.org Date: Sun, 04 Feb 2018 01:22:08 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] trafodion git commit: TRAFODION-2932 ConnectionTimeout value for jdbc cannot lager than 32768 Repository: trafodion Updated Branches: refs/heads/master 1f55c285b -> 700c8a5d5 TRAFODION-2932 ConnectionTimeout value for jdbc cannot lager than 32768 Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/c72e47eb Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/c72e47eb Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/c72e47eb Branch: refs/heads/master Commit: c72e47eb49e3612d531353cd56d4a81735ba95f7 Parents: 47713b9 Author: mashengchen Authored: Sun Jan 28 17:45:23 2018 +0800 Committer: mashengchen Committed: Sun Jan 28 17:45:23 2018 +0800 ---------------------------------------------------------------------- .../src/main/java/org/trafodion/jdbc/t4/T4Properties.java | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/c72e47eb/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java ---------------------------------------------------------------------- diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java index 8530b8c..be9d90f 100644 --- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java +++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/T4Properties.java @@ -1292,6 +1292,11 @@ public class T4Properties { * @see #setServerDataSource(String) */ void setConnectionTimeout(int connectionTimeout) { + if (connectionTimeout > Short.MAX_VALUE) { + sqlExceptionMessage_ = "Incorrect value for connectionTimeout set: [" + connectionTimeout + + "]. Max value is: [" + Short.MAX_VALUE + "]"; + } + if (connectionTimeout < 0) { /* * sqlExceptionMessage_ = "Incorrect value for connectionTimeout