JDBC savepoint management fix (unwrap DBC model)

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/controls/resultset/ResultSetPersister.java

@@ -827,12 +827,15 @@ class ResultSetPersister {
                 DBeaverUI.syncExec(new Runnable() {
                     @Override
                     public void run() {
-                        for (int i = 0; i < rows.size(); i++) {
-                            if (refreshValues[i] != null) {
-                                rows.get(i).values = refreshValues[i];
+                        // Update only if metadata wasn't changed
+                        if (!viewer.getControl().isDisposed() && viewer.getModel().getAttributes() == curAttributes) {
+                            for (int i = 0; i < rows.size(); i++) {
+                                if (refreshValues[i] != null) {
+                                    rows.get(i).values = refreshValues[i];
+                                }
                             }
+                            viewer.redrawData(true);
                         }
-                        viewer.redrawData(true);
                     }
                 });
                 return Status.OK_STATUS;

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCExecutionContext.java

@@ -344,7 +344,9 @@ public class JDBCExecutionContext extends AbstractExecutionContext<JDBCDataSourc
     {
         try {
             if (savepoint != null) {
-                if (savepoint instanceof Savepoint) {
+                if (savepoint instanceof JDBCSavepointImpl) {
+                    getConnection().rollback(((JDBCSavepointImpl) savepoint).getOriginal());
+                } else if (savepoint instanceof Savepoint) {
                     getConnection().rollback((Savepoint) savepoint);
                 } else {
                     throw new SQLFeatureNotSupportedException(ModelMessages.model_jdbc_exception_bad_savepoint_object);