avoid NPE when polling for progressmonitor

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / util / ProgressMonitorClientManager.java

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
index e64421452f6c0c4025018e2192c8e40d7cecca02..39b816e673b15b950ff8ba8fa46854760985e4cb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
@@ -133,6 +133,8 @@ public class ProgressMonitorClientManager {
                 // wait for pollInterval, then
                 // .... retrieve remoting monitor, then
                 //      .... set client monitor info
+
+                IRemotingProgressMonitor previousRemotingMonitor = remotingMonitor;
                 Thread.sleep(pollInterval);
                 try{
                     remotingMonitor = progressMonitorService.getRemotingMonitor(uuid);
@@ -140,6 +142,9 @@ public class ProgressMonitorClientManager {
                     failCount--;
                     if (failCount > 0){
                         continue;
+                        remotingMonitor = previousRemotingMonitor;
+                    }else{
+                        throw e;
                     }
 
                 }