Pull request #615: ROCKSOLID-9170 Removes the dependency on CachedRow…

…SetImpl.

Merge in MC/connect from bugfix/ROCKSOLID-9170-complete-work-to-remove-dependency-on-cachedrowsetimpl to 4.1.x

* commit '6121490d8fa8ae5b36c95f73f9dadf79c40fde6c':
  ROCKSOLID-9170 Removes the dependency on CachedRowSetImpl.

server/src/com/mirth/connect/connectors/jdbc/DatabaseReceiverQuery.java

@@ -28,9 +28,9 @@
 import com.mirth.connect.donkey.server.ConnectorTaskException;
 import com.mirth.connect.server.controllers.ContextFactoryController;
 import com.mirth.connect.server.controllers.ControllerFactory;
+import com.mirth.connect.server.userutil.MirthCachedRowSet;
 import com.mirth.connect.server.util.TemplateValueReplacer;
 import com.mirth.connect.server.util.javascript.MirthContextFactory;
-import com.sun.rowset.CachedRowSetImpl;
 
 public class DatabaseReceiverQuery implements DatabaseReceiverDelegate {
     private PreparedStatement selectStatement;
@@ -192,7 +192,7 @@ public Object poll() throws DatabaseReceiverException, InterruptedException {
                 // if we are not caching the ResultSet, return it immediately
                 if (connectorProperties.isCacheResults()) {
                     // if we are caching the ResultSet, convert it into a CachedRowSet and return it
-                    cachedRowSet = new CachedRowSetImpl();
+                    cachedRowSet = new MirthCachedRowSet();
                     cachedRowSet.populate(resultSet);
                     DbUtils.closeQuietly(resultSet);
                     resultSet = cachedRowSet;