You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2018/06/11 21:26:23 UTC
[1/2] trafodion git commit: TRAFODION-3069
Repository: trafodion
Updated Branches:
refs/heads/master 2ca9a0386 -> 98b3ac3ab
TRAFODION-3069
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/04e50d35
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/04e50d35
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/04e50d35
Branch: refs/heads/master
Commit: 04e50d3528fb3a3e9f77302456c55594a0eb42b0
Parents: c826bce
Author: aven <sh...@esgyn.cn>
Authored: Fri Jun 1 11:46:04 2018 +0800
Committer: aven <sh...@esgyn.cn>
Committed: Fri Jun 1 11:46:04 2018 +0800
----------------------------------------------------------------------
.../src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafodion/blob/04e50d35/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
----------------------------------------------------------------------
diff --git a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
index 46bed22..2c12862 100644
--- a/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
+++ b/core/conn/jdbcT4/src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java
@@ -700,7 +700,7 @@ class InterfaceConnection {
_security.openCertificate();
this.encryptPassword();
}catch(SecurityException se) {
- if(se.getErrorCode() != 29713) {
+ if(se.getErrorCode() != 29713 && se.getErrorCode() != 29721) {
throw se; //we have a fatal error
}
[2/2] trafodion git commit: Merge remote branch 'origin/pr/1566/head'
into merge_1566
Posted by sa...@apache.org.
Merge remote branch 'origin/pr/1566/head' into merge_1566
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/98b3ac3a
Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/98b3ac3a
Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/98b3ac3a
Branch: refs/heads/master
Commit: 98b3ac3ab399234597666da1c7fa751745028b51
Parents: 2ca9a03 04e50d3
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Jun 11 21:25:57 2018 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Jun 11 21:25:57 2018 +0000
----------------------------------------------------------------------
.../src/main/java/org/trafodion/jdbc/t4/InterfaceConnection.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------