Author: shawkins Date: 2011-02-22 15:57:16 -0500 (Tue, 22 Feb 2011) New Revision: 2922 Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java Log: foward merging 7.1.1 Modified: trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2011-02-22 20:56:11 UTC (rev 2921) +++ trunk/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java 2011-02-22 20:57:16 UTC (rev 2922) @@ -150,7 +150,7 @@ // application_name was not reported by releases before 9.0.) sendParameterStatus("client_encoding", this.encoding.name()); - sendParameterStatus("DateStyle", this.props.getProperty("DateStyle")); + sendParameterStatus("DateStyle", this.props.getProperty("DateStyle", "ISO")); sendParameterStatus("integer_datetimes", "off"); sendParameterStatus("is_superuser", "off"); sendParameterStatus("server_encoding", "SQL_ASCII"); @@ -206,7 +206,9 @@ } public void setEncoding(Charset value) { - this.encoding = value; + if (value != null) { + this.encoding = value; + } } @Override