TEIID-3839 sending just the timezone id as well

teiid · Nov 23, 2015 · 1c3931c · 1c3931c
1 parent deb4fec
commit 1c3931c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/client/src/main/java/org/teiid/client/security/LogonResult.java b/client/src/main/java/org/teiid/client/security/LogonResult.java
@@ -115,11 +115,17 @@ public void readExternal(ObjectInput in) throws IOException,
 			ClassNotFoundException {
 		vdbName = (String)in.readObject();
 		sessionToken = (SessionToken)in.readObject();
-		timeZone = (TimeZone)in.readObject();
+		try {
+			timeZone = (TimeZone) in.readObject();
+		} catch (Exception e) {
+			//could be a sun.util object
+		}
 		clusterName = (String)in.readObject();
 		vdbVersion = in.readInt();
 		try {
 			addtionalProperties = ExternalizeUtil.readMap(in);
+			String tzId = in.readUTF(); //not sent until 8.12.3
+			timeZone = TimeZone.getTimeZone(tzId);
 		} catch (EOFException e) {
 
 		} catch (OptionalDataException e) {
@@ -135,6 +141,7 @@ public void writeExternal(ObjectOutput out) throws IOException {
 		out.writeObject(clusterName);
 		out.writeInt(vdbVersion);
 		ExternalizeUtil.writeMap(out, addtionalProperties);
+		out.writeUTF(timeZone.getID());
 	}
 
 }