[libpostgresql-jdbc-java] 39/128: log can not be output when using DataSource property settings were not being copied to the datasource these included logLevel, binaryTranfer, sslfactory, applicationName patch provided by Chen Huajun
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Jan 9 10:18:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag REL9_3_1100
in repository libpostgresql-jdbc-java.
commit e16ba69f93c4b032203444900ab4e59cfb681333
Author: Dave Cramer <davecramer at gmail.com>
Date: Thu Feb 7 08:55:06 2013 -0500
log can not be output when using DataSource
property settings were not being copied to the datasource
these included logLevel, binaryTranfer, sslfactory, applicationName
patch provided by Chen Huajun
---
org/postgresql/ds/common/BaseDataSource.java | 63 +++++++++++++++++++++++-----
1 file changed, 53 insertions(+), 10 deletions(-)
diff --git a/org/postgresql/ds/common/BaseDataSource.java b/org/postgresql/ds/common/BaseDataSource.java
index bfe54f7..271642b 100644
--- a/org/postgresql/ds/common/BaseDataSource.java
+++ b/org/postgresql/ds/common/BaseDataSource.java
@@ -43,15 +43,15 @@ public abstract class BaseDataSource implements Referenceable
// Standard properties, defined in the JDBC 2.0 Optional Package spec
private String serverName = "localhost";
- private String databaseName;
+ private String databaseName = "";
private String user;
private String password;
private int portNumber = 0;
private int prepareThreshold = 5;
private int unknownLength = Integer.MAX_VALUE;
private boolean binaryTransfer = true;
- private String binaryTransferEnable = "";
- private String binaryTransferDisable = "";
+ private String binaryTransferEnable;
+ private String binaryTransferDisable;
private int loginTimeout = 0; // in seconds
private int socketTimeout = 0; // in seconds
private int receiveBufferSize = -1; // off (-1), not in use
@@ -63,6 +63,7 @@ public abstract class BaseDataSource implements Referenceable
private int logLevel = 0;
private int protocolVersion = 0;
private String applicationName;
+ private boolean logLevelSet = false;
/**
* Gets a connection to the PostgreSQL database. The database is identified by the
@@ -184,6 +185,7 @@ public abstract class BaseDataSource implements Referenceable
public void setLogLevel(int logLevel)
{
this.logLevel = logLevel;
+ logLevelSet = true;
}
public int getProtocolVersion()
@@ -295,6 +297,14 @@ public abstract class BaseDataSource implements Referenceable
}
/**
+ * Gets the write buffer size of TCP/IP socket.
+ */
+ public int getReceiveBufferSize()
+ {
+ return receiveBufferSize;
+ }
+
+ /**
* Sets the write buffer size of TCP/IP socket.
*/
public void setReceiveBufferSize(int nbytes)
@@ -303,6 +313,14 @@ public abstract class BaseDataSource implements Referenceable
}
/**
+ * Gets the send buffer size of TCP/IP socket.
+ */
+ public int getSendBufferSize()
+ {
+ return sendBufferSize;
+ }
+
+ /**
* Sets the send buffer size of TCP/IP socket.
*/
public void setSendBufferSize(int nbytes)
@@ -486,7 +504,9 @@ public abstract class BaseDataSource implements Referenceable
sb.append("&socketTimeout=").append(socketTimeout);
sb.append("&prepareThreshold=").append(prepareThreshold);
sb.append("&unknownLength=").append(unknownLength);
- sb.append("&loglevel=").append(logLevel);
+ if (logLevelSet) {
+ sb.append("&loglevel=").append(logLevel);
+ }
if (protocolVersion != 0) {
sb.append("&protocolVersion=").append(protocolVersion);
}
@@ -510,10 +530,14 @@ public abstract class BaseDataSource implements Referenceable
sb.append("&ApplicationName=");
sb.append(applicationName);
}
- if (binaryTransfer) {
- sb.append("&binaryTransfer=true");
+ sb.append("&binaryTransfer=").append(binaryTransfer);
+ if (binaryTransferEnable != null) {
+ sb.append("&binaryTransferEnable=").append(binaryTransferEnable);
}
-
+ if (binaryTransferDisable != null) {
+ sb.append("&binaryTransferDisable=").append(binaryTransferDisable);
+ }
+
return sb.toString();
}
@@ -548,11 +572,22 @@ public abstract class BaseDataSource implements Referenceable
ref.add(new StringRefAddr("prepareThreshold", Integer.toString(prepareThreshold)));
ref.add(new StringRefAddr("unknownLength", Integer.toString(unknownLength)));
ref.add(new StringRefAddr("binaryTransfer", Boolean.toString(binaryTransfer)));
+ if (binaryTransferEnable != null)
+ {
+ ref.add(new StringRefAddr("binaryTransferEnable", binaryTransferEnable));
+ }
+ if (binaryTransferDisable != null)
+ {
+ ref.add(new StringRefAddr("binaryTransferDisable", binaryTransferDisable));
+ }
ref.add(new StringRefAddr("loginTimeout", Integer.toString(loginTimeout)));
ref.add(new StringRefAddr("socketTimeout", Integer.toString(socketTimeout)));
ref.add(new StringRefAddr("ssl", Boolean.toString(ssl)));
- ref.add(new StringRefAddr("sslfactory", sslfactory));
+ if(sslfactory !=null)
+ {
+ ref.add(new StringRefAddr("sslfactory", sslfactory));
+ }
ref.add(new StringRefAddr("receiveBufferSize", Integer.toString(receiveBufferSize)));
ref.add(new StringRefAddr("sendBufferSize", Integer.toString(sendBufferSize)));
@@ -562,9 +597,15 @@ public abstract class BaseDataSource implements Referenceable
ref.add(new StringRefAddr("compatible", compatible));
}
- ref.add(new StringRefAddr("logLevel", Integer.toString(logLevel)));
+ if(logLevelSet)
+ {
+ ref.add(new StringRefAddr("logLevel", Integer.toString(logLevel)));
+ }
ref.add(new StringRefAddr("protocolVersion", Integer.toString(protocolVersion)));
- ref.add(new StringRefAddr("ApplicationName", applicationName));
+ if(applicationName != null)
+ {
+ ref.add(new StringRefAddr("ApplicationName", applicationName));
+ }
return ref;
}
@@ -592,6 +633,7 @@ public abstract class BaseDataSource implements Referenceable
out.writeBoolean(binaryTransfer);
out.writeObject(binaryTransferEnable);
out.writeObject(binaryTransferDisable);
+ out.writeBoolean(logLevelSet);
}
protected void readBaseObject(ObjectInputStream in) throws IOException, ClassNotFoundException
@@ -617,6 +659,7 @@ public abstract class BaseDataSource implements Referenceable
binaryTransfer = in.readBoolean();
binaryTransferEnable = (String)in.readObject();
binaryTransferDisable = (String)in.readObject();
+ logLevelSet = in.readBoolean();
}
public void initializeFrom(BaseDataSource source) throws IOException, ClassNotFoundException {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libpostgresql-jdbc-java.git
More information about the pkg-java-commits
mailing list