This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to tag REL8_3_604 in repository libpostgresql-jdbc-java.
commit 6efa10baae8290a0b807e79ac129c95601418c13 Author: Kris Jurka <[email protected]> Date: Sun Apr 13 15:49:24 2008 +0000 The DataSource options for ssl where not correctly being serialized or included in the Reference. --- org/postgresql/ds/common/BaseDataSource.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/org/postgresql/ds/common/BaseDataSource.java b/org/postgresql/ds/common/BaseDataSource.java index 30b94b8..d3e7a39 100644 --- a/org/postgresql/ds/common/BaseDataSource.java +++ b/org/postgresql/ds/common/BaseDataSource.java @@ -3,7 +3,7 @@ * Copyright (c) 2004-2008, PostgreSQL Global Development Group * * IDENTIFICATION -* $PostgreSQL: pgjdbc/org/postgresql/ds/common/BaseDataSource.java,v 1.9 2007/07/27 09:10:54 jurka Exp $ +* $PostgreSQL: pgjdbc/org/postgresql/ds/common/BaseDataSource.java,v 1.10 2008/01/08 06:56:27 jurka Exp $ * *------------------------------------------------------------------------- */ @@ -357,6 +357,10 @@ public abstract class BaseDataSource implements Referenceable ref.add(new StringRefAddr("prepareThreshold", Integer.toString(prepareThreshold))); ref.add(new StringRefAddr("loginTimeout", Integer.toString(loginTimeout))); + + ref.add(new StringRefAddr("ssl", Boolean.toString(ssl))); + ref.add(new StringRefAddr("sslfactory", sslfactory)); + return ref; } @@ -369,6 +373,8 @@ public abstract class BaseDataSource implements Referenceable out.writeInt(portNumber); out.writeInt(prepareThreshold); out.writeInt(loginTimeout); + out.writeBoolean(ssl); + out.writeObject(sslfactory); } protected void readBaseObject(ObjectInputStream in) throws IOException, ClassNotFoundException @@ -380,6 +386,8 @@ public abstract class BaseDataSource implements Referenceable portNumber = in.readInt(); prepareThreshold = in.readInt(); loginTimeout = in.readInt(); + ssl = in.readBoolean(); + sslfactory = (String)in.readObject(); } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
