[teiid-commits] teiid SVN: r2920 - branches/7.1.x/runtime/src/main/java/org/teiid/transport.

[teiid-commits at lists.jboss.org]

Author: rareddy
Date: 2011-02-22 12:36:19 -0500 (Tue, 22 Feb 2011)
New Revision: 2920

Modified:
   branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
Log:
TEIID-1477: The older clients were not setting the "DateStyle" property which is always present in the newer version of the driver. The code is written to expect it, now it supplies the default DateStyle as ISO, if not found one.

Modified: branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java
===================================================================
--- branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java	2011-02-21 14:57:16 UTC (rev 2919)
+++ branches/7.1.x/runtime/src/main/java/org/teiid/transport/PgBackendProtocol.java	2011-02-22 17:36:19 UTC (rev 2920)
@@ -139,7 +139,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");
@@ -195,7 +195,9 @@
 	}
 	
 	public void setEncoding(Charset value) {
-		this.encoding = value;
+		if (value != null) {
+			this.encoding = value;
+		}
 	}
 
 	@Override