[BACKLOG-11076] reset connection on repo loss detection (#3701)

pentaho · Mar 28, 2017 · f833566 · f833566
1 parent 6dcecbb
commit f833566
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 24 deletions.
diff --git a/ui/src/org/pentaho/di/ui/spoon/Spoon.java b/ui/src/org/pentaho/di/ui/spoon/Spoon.java
@@ -3297,9 +3297,12 @@ public boolean tabClose( TabItem item ) {
 
   public boolean tabClose( TabItem item, boolean force ) {
     try {
-      return delegates.tabs.tabClose( item, force );
-    } catch ( KettleRepositoryLostException e ) {
-      handleRepositoryLost( e );
+      try {
+        return delegates.tabs.tabClose( item, force );
+      } catch ( KettleRepositoryLostException e ) {
+        handleRepositoryLost( e );
+        return delegates.tabs.tabClose( item, force );
+      }
     } catch ( Exception e ) {
       new ErrorDialog( shell, "Error", "Unexpected error closing tab!", e );
     }
@@ -5168,7 +5171,7 @@ public boolean saveToRepository( EngineMetaInterface meta, boolean ask_name ) th
         }
       }
 
-      if ( answer && !Utils.isEmpty( meta.getName() ) ) {
+      if ( answer && !Utils.isEmpty( meta.getName() ) && rep != null ) {
 
         int response = SWT.YES;
 
@@ -6347,18 +6350,23 @@ public void refreshTree() {
 
     DatabasesCollector collector = new DatabasesCollector( meta, rep );
     try {
-      collector.collectDatabases();
+      try {
+        collector.collectDatabases();
+      } catch ( KettleException e ) {
+        if ( e.getCause() instanceof KettleRepositoryLostException ) {
+          handleRepositoryLost( (KettleRepositoryLostException) e.getCause() );
+          collector = new DatabasesCollector( meta, null );
+          collector.collectDatabases();
+        } else {
+          throw e;
+        }
+      }
     } catch ( KettleException e ) {
-      if ( e.getCause() instanceof KettleRepositoryLostException ) {
-        handleRepositoryLost( (KettleRepositoryLostException) e.getCause() );
-      } else {
-        new ErrorDialog( shell,
+      new ErrorDialog( shell,
           BaseMessages.getString( PKG, "Spoon.ErrorDialog.Title" ),
           BaseMessages.getString( PKG, "Spoon.ErrorDialog.ErrorFetchingFromRepo.DbConnections" ),
           e
         );
-      }
-      return;
     }
 
     for ( String dbName : collector.getDatabaseNames() ) {
@@ -6374,21 +6382,19 @@ public void refreshTree() {
     }
   }
 
-  private void handleRepositoryLost( KettleRepositoryLostException e ) {
-    if ( closeRepositoryLost( e ) ) {
-      setRepository( null );
-      SpoonPluginManager.getInstance().notifyLifecycleListeners( SpoonLifeCycleEvent.REPOSITORY_DISCONNECTED );
-      setShellText();
-      enableMenus();
-    }
+  public void handleRepositoryLost( KettleRepositoryLostException e ) {
+    setRepository( null );
+    warnRepositoryLost( e );
+    SpoonPluginManager.getInstance().notifyLifecycleListeners( SpoonLifeCycleEvent.REPOSITORY_DISCONNECTED );
+    setShellText();
+    enableMenus();
   }
 
-  private boolean closeRepositoryLost( KettleRepositoryLostException e ) {
-    MessageBox box = new MessageBox( shell, SWT.OK | SWT.CANCEL );
+  private void warnRepositoryLost( KettleRepositoryLostException e ) {
+    MessageBox box = new MessageBox( shell, SWT.OK | SWT.ICON_WARNING );
     box.setText( BaseMessages.getString( PKG, "System.Warning" ) );
     box.setMessage( e.getPrefaceMessage() );
-    int result = box.open();
-    return result == SWT.OK;
+    box.open();
   }
 
   private void refreshStepsSubtree( TreeItem tiRootName, TransMeta meta, GUIResource guiResource ) {
@@ -6825,7 +6831,11 @@ public void setShellText() {
       filename = meta.getFilename();
       name = meta.getName();
       version = meta.getObjectRevision() == null ? null : meta.getObjectRevision().getName();
-      versioningEnabled = isVersionEnabled( rep, meta );
+      try {
+        versioningEnabled = isVersionEnabled( rep, meta );
+      } catch ( KettleRepositoryLostException krle ) {
+        handleRepositoryLost( krle );
+      }
     }
 
     String text = "";

diff --git a/ui/src/org/pentaho/di/ui/spoon/job/JobGraph.java b/ui/src/org/pentaho/di/ui/spoon/job/JobGraph.java
@@ -3,7 +3,7 @@
  *
  * Pentaho Data Integration
  *
- * Copyright (C) 2002-2016 by Pentaho : http://www.pentaho.com
+ * Copyright (C) 2002-2017 by Pentaho : http://www.pentaho.com
  *
  *******************************************************************************
  *
@@ -3617,6 +3617,7 @@ public void run() {
               RepositoryOperation.EXECUTE_JOB  );
         } catch ( KettleRepositoryLostException krle ) {
           log.logError( krle.getLocalizedMessage() );
+          spoon.handleRepositoryLost( krle );
         }
 
         // Start/Run button...

diff --git a/ui/src/org/pentaho/di/ui/spoon/trans/TransGraph.java b/ui/src/org/pentaho/di/ui/spoon/trans/TransGraph.java
@@ -4132,6 +4132,7 @@ public void run() {
               RepositoryOperation.EXECUTE_TRANSFORMATION );
         } catch ( KettleRepositoryLostException krle ) {
           log.logError( krle.getLocalizedMessage() );
+          spoon.handleRepositoryLost( krle );
         }
 
         // Start/Run button...