--- old/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java	2018-12-06 14:53:43.616075956 -0500
+++ new/src/java.sql.rowset/share/classes/com/sun/rowset/CachedRowSetImpl.java	2018-12-06 14:53:43.440075083 -0500
@@ -593,7 +593,7 @@
 
         super.setCommand(cmd);
 
-        if(!buildTableName(cmd).equals("")) {
+        if(!buildTableName(cmd).isEmpty()) {
             this.setTableName(buildTableName(cmd));
         }
     }
@@ -7069,7 +7069,7 @@
     public void setMatchColumn(String[] columnNames) throws SQLException {
 
         for(int j = 0; j < columnNames.length; j++) {
-           if( columnNames[j] == null || columnNames[j].equals("")) {
+           if( columnNames[j] == null || columnNames[j].isEmpty()) {
               throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.matchcols2").toString());
            }
         }
@@ -7124,7 +7124,7 @@
      */
     public void setMatchColumn(String columnName) throws SQLException {
         // validate, if col is ok to be set
-        if(columnName == null || (columnName= columnName.trim()).equals("") ) {
+        if(columnName == null || (columnName= columnName.trim()).isEmpty() ) {
             throw new SQLException(resBundle.handleGetObject("cachedrowsetimpl.matchcols2").toString());
         } else {
             // set strMatchColumn