monetdb-java: src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java comparison

comparison src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java @ 348:bcb9a99d399d

Add private checkNotClosed() method to check if the connection is not closed. Call the method from all methods which require that the connection is not closed. Disabled not needed check in setNetworkTimeout(), such that it can be used now.

author	Martin van Dinther <martin.van.dinther@monetdbsolutions.com>
date	Thu, 21 Nov 2019 19:58:18 +0100 (2019-11-21)
parents	45155894aece
children	54137aeb1f92

comparison

equal deleted inserted replaced

-:4e2685f0b7fd
+:bcb9a99d399d
 		// check mandatory input arguments
 		if (hostname == null || hostname.isEmpty())
 			throw new IllegalArgumentException("Missing or empty host name");
 		if (port <= 0 || port > 65535)
-			throw new IllegalArgumentException("Invalid port number: " + port + ". It should not be " + (port < 0 ? "negative" : (port > 65535 ? "larger than 65535" : "0")));
+			throw new IllegalArgumentException("Invalid port number: " + port
+					+ ". It should not be " + (port < 0 ? "negative" : (port > 65535 ? "larger than 65535" : "0")));
 		if (username == null || username.isEmpty())
 			throw new IllegalArgumentException("Missing or empty user name");
 		if (password == null || password.isEmpty())
 			throw new IllegalArgumentException("Missing or empty password");
 		if (language == null || language.isEmpty()) {
 	 * @throws SQLException if a database access error occurs or this method is
 	 *         called on a closed connection
 	 */
 	@Override
 	public SQLWarning getWarnings() throws SQLException {
-		if (closed)
+		checkNotClosed();
-			throw new SQLException("Cannot call on closed Connection", "M1M20");
 		// if there are no warnings, this will be null, which fits with the
 		// specification.
 		return warnings;
 	}
 	 */
 	@Override
 	public CallableStatement prepareCall(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability)
 		throws SQLException
 	{
+		checkNotClosed();
 		try {
 			final CallableStatement ret = new MonetCallableStatement(
 				this,
 				resultSetType,
 				resultSetConcurrency,
 	 */
 	@Override
 	public PreparedStatement prepareStatement(final String sql, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability)
 		throws SQLException
 	{
+		checkNotClosed();
 		try {
 			final PreparedStatement ret = new MonetPreparedStatement(
 				this,
 				resultSetType,
 				resultSetConcurrency,
 	 *         Savepoint object is not a valid savepoint in the current
 	 *         transaction
 	 */
 	@Override
 	public void releaseSavepoint(final Savepoint savepoint) throws SQLException {
+		checkNotClosed();
 		if (!(savepoint instanceof MonetSavepoint))
 			throw new SQLException("This driver can only handle savepoints it created itself", "M0M06");
 		final MonetSavepoint sp = (MonetSavepoint)savepoint;
 	 *         Connection object is in auto-commit mode
 	 * @see #setAutoCommit(boolean)
 	 */
 	@Override
 	public void rollback() throws SQLException {
+		checkNotClosed();
 		// note: can't use sendIndependentCommand here because we need
 		// to process the auto_commit state the server gives
 		sendTransactionCommand("ROLLBACK");
 	}
 	 *         Savepoint object is no longer valid, or this Connection
 	 *         object is currently in auto-commit mode
 	 */
 	@Override
 	public void rollback(final Savepoint savepoint) throws SQLException {
+		checkNotClosed();
 		if (!(savepoint instanceof MonetSavepoint))
 			throw new SQLException("This driver can only handle savepoints it created itself", "M0M06");
 		final MonetSavepoint sp = (MonetSavepoint)savepoint;
 	 * @throws SQLException if a database access error occurs
 	 * @see #getAutoCommit()
 	 */
 	@Override
 	public void setAutoCommit(final boolean autoCommit) throws SQLException {
+		checkNotClosed();
 		if (this.autoCommit != autoCommit) {
 			sendControlCommand("auto_commit " + (autoCommit ? "1" : "0"));
 			this.autoCommit = autoCommit;
 		}
 	}
 	 * @throws SQLException if a database access error occurs or this Connection
 	 *         object is currently in auto-commit mode
 	 */
 	@Override
 	public Savepoint setSavepoint() throws SQLException {
+		checkNotClosed();
 		// create a new Savepoint object
 		final MonetSavepoint sp = new MonetSavepoint();
 		// note: can't use sendIndependentCommand here because we need
 		// to process the auto_commit state the server gives
 	 * @throws SQLException if a database access error occurs or this Connection
 	 *         object is currently in auto-commit mode
 	 */
 	@Override
 	public Savepoint setSavepoint(final String name) throws SQLException {
+		checkNotClosed();
 		// create a new Savepoint object
 		final MonetSavepoint sp;
 		try {
 			sp = new MonetSavepoint(name);
 		} catch (IllegalArgumentException e) {
 	 */
 	@Override
 	public String getClientInfo(final String name) throws SQLException {
 		if (name == null || name.isEmpty())
 			return null;
+		checkNotClosed();
 		return conn_props.getProperty(name);
 	}
 	/**
 	 * Returns a list containing the name and current value of each client info
 	 *	or this method is called on a closed connection
 	 * @since 1.6
 	 */
 	@Override
 	public Properties getClientInfo() throws SQLException {
+		checkNotClosed();
 		// return a clone of the connection properties object
 		return new Properties(conn_props);
 	}
 	/**
 	 *         method is called on a closed connection
 	 * @since 1.7
 	 */
 	@Override
 	public void setSchema(final String schema) throws SQLException {
-		if (closed)
+		checkNotClosed();
-			throw new SQLException("Cannot call on closed Connection", "M1M20");
 		if (schema == null || schema.isEmpty())
 			throw new SQLException("Missing schema name", "M1M05");
 		Statement st = null;
 		try {
 	 *         method is called on a closed connection
 	 * @since 1.7
 	 */
 	@Override
 	public String getSchema() throws SQLException {
-		if (closed)
+		checkNotClosed();
-			throw new SQLException("Cannot call on closed Connection", "M1M20");
 		String cur_schema = null;
 		Statement st = null;
 		ResultSet rs = null;
 		try {
 	 *         null, or the value specified for seconds is less than 0.
 	 * @since 1.7
 	 */
 	@Override
 	public void setNetworkTimeout(final Executor executor, final int millis) throws SQLException {
-		if (closed)
+		checkNotClosed();
-			throw new SQLException("Cannot call on closed Connection", "M1M20");
+//		executor object is not used yet, so no need to test it.
-		if (executor == null)
+//		if (executor == null)
-			throw new SQLException("executor is null", "M1M05");
+//			throw new SQLException("executor is null", "M1M05");
 		if (millis < 0)
 			throw new SQLException("milliseconds is less than zero", "M1M05");
 		try {
 			server.setSoTimeout(millis);
 	 *         this method is called on a closed Connection
 	 * @since 1.7
 	 */
 	@Override
 	public int getNetworkTimeout() throws SQLException {
-		if (closed)
+		checkNotClosed();
-			throw new SQLException("Cannot call on closed Connection", "M1M20");
 		try {
 			return server.getSoTimeout();
 		} catch (SocketException e) {
 			throw new SQLNonTransientConnectionException(e.getMessage(), "08000");
 		}
 	 * instead of getClob() and Clob.getCharacterStream() to reduce overhead.
 	 * It is called from: MonetResultSet and MonetPreparedStatement
 	 */
 	boolean mapClobAsVarChar() {
 		return treatClobAsVarChar;
+	}
+	/**
+	 * Local helper method to test whether the Connection object is closed
+	 * When closed it throws an SQLException
+	 */
+	private void checkNotClosed() throws SQLException {
+		if (closed)
+			throw new SQLException("Connection is closed", "M1M20");
 	}
 	/**
 	 * @return the MonetDB JDBC Connection URL (without user name and password).
 	 * It is called from: getURL()in MonetDatabaseMetaData

Mercurial > hg > monetdb-java

comparison src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java @ 348:bcb9a99d399d