Project

General

Profile

Revision 8e204953

ID8e204953da14e5e759eada9e9cf36a36e56c8c18
Parent c5ea433d
Child f2199620

Added by Katja Luther over 3 years ago

minor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/ProgressMonitorClientManager.java
87 87
            // wait about 10 seconds for the remoting monitor to be initialised
88 88
            // (i.e. for the begin task method to be called ON THE REMOTING MONITOR)
89 89
            for(int i=0;i<START_DELAY;i++) {
90
                Thread.sleep(1000);
90
                Thread.sleep(500);
91 91
                logger.info("Waiting for monitered work to start ..");
92 92
                remotingMonitor = progressMonitorService.getRemotingMonitor(uuid);
93 93
                if(remotingMonitor.getTotalWork() > 0) {
......
100 100
                return remotingMonitor;
101 101
//                throw new InterruptedException("Monitor has zero work units");
102 102
            }else if (remotingMonitor.getTotalWork() == 0 ){
103
                throw new InterruptedException("Monitor has zero work units");
103
                Object result = remotingMonitor.getResult();
104
                InterruptedException exception = new InterruptedException("Monitor has zero work units");
105
                if (result instanceof UpdateResult){
106
                    ((UpdateResult)result).addException(exception);
107
                }else if (result == null){
108
                    result = new UpdateResult();
109
                }
110

  
104 111
            }
105 112
            // start the client monitor
106 113
            monitor.beginTask(label, remotingMonitor.getTotalWork());
......
127 134
                            if (result instanceof UpdateResult){
128 135
                                ((UpdateResult)result).addException(exception);
129 136
                            }
130

  
137
                            return remotingMonitor;
131 138
                        }
132 139
                        feedbackGenerators.get(feedbackCount).setFeedbackForMonitor(uuid);
133 140
                        feedbackCount++;

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)