/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.jena.query;

import java.io.Closeable ;

import org.apache.jena.query.QueryExecution ;
import org.apache.jena.query.ResultSet ;
import org.apache.jena.sparql.resultset.ResultSetWrapper ;

/** A {@link ResultSet} that closes the associated {@link QueryExecution} 
 * via {@link AutoCloseable}.
 */  
public class ResultSetCloseable extends ResultSetWrapper implements AutoCloseable, Closeable {

    /** Return a closable resultset for a {@link QueryExecution}.
     * The {@link QueryExecution} must be for a {@code SELECT} query.
     * @param queryExecution {@code QueryExecution} must be for a {@code SELECT} query.
     * @return ResultSetCloseable
     */
    public static ResultSetCloseable closeableResultSet(QueryExecution queryExecution) {
        if ( ! queryExecution.getQuery().isSelectType() )
            throw new IllegalArgumentException("Not an execution for a SELECT query");
        return new ResultSetCloseable(queryExecution.execSelect(), queryExecution) ;
    }
    
    private QueryExecution qexec ;

    public ResultSetCloseable(ResultSet rs, QueryExecution qexec) {
        super(rs) ;
        this.qexec = qexec ;
    }

    @Override
    public void close() {
        qexec.close() ;
    }
}

@@ -1581,16 +1581,53 @@
     if (
+ queryExecution.getQuery() != null &&
  ! query

Check query exists to be tested.