ClientConnection.java (hsqldb-2.7.0) | : | ClientConnection.java (hsqldb-2.7.1) | ||
---|---|---|---|---|
skipping to change at line 66 | skipping to change at line 66 | |||
import org.hsqldb.server.HsqlSocketFactory; | import org.hsqldb.server.HsqlSocketFactory; | |||
import org.hsqldb.types.BlobDataID; | import org.hsqldb.types.BlobDataID; | |||
import org.hsqldb.types.ClobDataID; | import org.hsqldb.types.ClobDataID; | |||
/** | /** | |||
* Base remote session proxy implementation. Uses instances of Result to | * Base remote session proxy implementation. Uses instances of Result to | |||
* transmit and receive data. This implementation utilises the updated HSQL | * transmit and receive data. This implementation utilises the updated HSQL | |||
* protocol. | * protocol. | |||
* | * | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.7.0 | * @version 2.7.1 | |||
* @since 1.7.2 | * @since 1.7.2 | |||
*/ | */ | |||
public class ClientConnection implements SessionInterface, Cloneable { | public class ClientConnection implements SessionInterface, Cloneable { | |||
/** | /** | |||
* Specifies the Compatibility version required for both Servers and | * Specifies the Compatibility version required for both Servers and | |||
* network JDBC Clients built with this baseline. Must remain public | * network JDBC Clients built with this baseline. Must remain public | |||
* for Server to have visibility to it. | * for Server to have visibility to it. | |||
* | * | |||
* Update this value only when the current version of HSQLDB does not | * Update this value only when the current version of HSQLDB does not | |||
skipping to change at line 139 | skipping to change at line 139 | |||
String database, boolean isTLS, | String database, boolean isTLS, | |||
boolean isTLSWrapper, String user, | boolean isTLSWrapper, String user, | |||
String password, TimeZone timeZone) { | String password, TimeZone timeZone) { | |||
this.host = host; | this.host = host; | |||
this.port = port; | this.port = port; | |||
this.path = path; | this.path = path; | |||
this.database = database; | this.database = database; | |||
this.isTLS = isTLS; | this.isTLS = isTLS; | |||
this.isTLSWrapper = isTLSWrapper; | this.isTLSWrapper = isTLSWrapper; | |||
this.zoneSeconds = timeZone.getOffset(System.currentTimeMillis()) / 100 | this.zoneSeconds = timeZone.getOffset(System.currentTimeMillis()) | |||
0; | / 1000; | |||
this.zoneString = timeZone.getID(); | this.zoneString = timeZone.getID(); | |||
initStructures(); | initStructures(); | |||
initConnection(host, port, isTLS); | initConnection(host, port, isTLS); | |||
Result login = Result.newConnectionAttemptRequest(user, password, | Result login = Result.newConnectionAttemptRequest(user, password, | |||
database, zoneString, zoneSeconds); | database, zoneString, zoneSeconds); | |||
Result resultIn = execute(login); | Result resultIn = execute(login); | |||
if (resultIn.isError()) { | if (resultIn.isError()) { | |||
throw Error.error(resultIn); | throw Error.error(resultIn); | |||
skipping to change at line 622 | skipping to change at line 623 | |||
calendarGMT.setLenient(false); | calendarGMT.setLenient(false); | |||
} | } | |||
return calendarGMT; | return calendarGMT; | |||
} | } | |||
public SimpleDateFormat getSimpleDateFormatGMT() { | public SimpleDateFormat getSimpleDateFormatGMT() { | |||
if (simpleDateFormatGMT == null) { | if (simpleDateFormatGMT == null) { | |||
simpleDateFormatGMT = new SimpleDateFormat("MMMM", Locale.ENGLISH); | simpleDateFormatGMT = new SimpleDateFormat("MMMM", | |||
HsqlDateTime.defaultLocale); | ||||
Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT"), | Calendar cal = new GregorianCalendar(TimeZone.getTimeZone("GMT"), | |||
HsqlDateTime.defaultLocale); | HsqlDateTime.defaultLocale); | |||
cal.setLenient(false); | cal.setLenient(false); | |||
simpleDateFormatGMT.setCalendar(cal); | simpleDateFormatGMT.setCalendar(cal); | |||
} | } | |||
return simpleDateFormatGMT; | return simpleDateFormatGMT; | |||
} | } | |||
End of changes. 3 change blocks. | ||||
5 lines changed or deleted | 6 lines changed or added |