remove handling for not thrown exception JvmLimitsExceed

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
index 9e2fef47835cc5c1af0f327354b1f255127e2c55..3d006b4539e39918c984100255bf84b57b8c276e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
@@ -48,7 +48,6 @@ import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO.InfoPart;
 import eu.etaxonomy.cdm.api.service.l10n.LocaleContext;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
 import eu.etaxonomy.cdm.api.util.DistributionOrder;
-import eu.etaxonomy.cdm.common.JvmLimitsException;
 import eu.etaxonomy.cdm.common.monitor.IRestServiceProgressMonitor;
 import eu.etaxonomy.cdm.ext.geo.CondensedDistributionConfiguration;
 import eu.etaxonomy.cdm.ext.geo.CondensedDistributionRecipe;
@@ -208,7 +207,7 @@ public class DescriptionListController
                                 modes, areaUuids, filter, progressMonitorController.getMonitor(transmissionEngineMonitorUuid));
                         DistributionAggregation distrAggr = new DistributionAggregation();
                         distrAggr.invoke(config, repository);
-                    } catch (JvmLimitsException e) {
+                    } catch (Exception e) {
                         IRestServiceProgressMonitor monitor = progressMonitorController.getMonitor(transmissionEngineMonitorUuid);
                         monitor.setIsFailed(true);
                         monitor.setFeedback(e);

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DescriptionAggregationBase.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DescriptionAggregationBase.java
index f0693090a7c6146ab749897d97c0eb10d13f1ff0..bce84edb54f4bf54014b40e7d3cd3fa7b9e6ebef 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DescriptionAggregationBase.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DescriptionAggregationBase.java
@@ -81,7 +81,7 @@ public abstract class DescriptionAggregationBase<T extends DescriptionAggregatio
     private long batchMinFreeHeap = BATCH_MIN_FREE_HEAP;
 
 
-    public final UpdateResult invoke(CONFIG config, ICdmRepository repository) throws JvmLimitsException{
+    public final UpdateResult invoke(CONFIG config, ICdmRepository repository){
         init(config, repository);
         return doInvoke();
     }

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java
index af34445a413238ce63203be4491accf20eaf4ed9..c2505e59eed60f001aae4419a8a8b1fd1fa4fe12 100755 (executable)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.cdm.api.service.config.SortIndexUpdaterConfigurator;
 import eu.etaxonomy.cdm.api.service.description.DescriptionAggregationBase;
 import eu.etaxonomy.cdm.api.service.description.DescriptionAggregationConfigurationBase;
 import eu.etaxonomy.cdm.api.service.dto.SpecimenRowWrapperDTO;
-import eu.etaxonomy.cdm.common.JvmLimitsException;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.RemotingProgressMonitorThread;
 import eu.etaxonomy.cdm.model.metadata.SecReferenceHandlingEnum;
@@ -92,14 +91,13 @@ public class LongRunningTasksService implements ILongRunningTasksService{
                     for(Exception e : updateResult.getExceptions()) {
                         monitor.addReport(e.getMessage());
                     }
-                } catch (JvmLimitsException e) {
-                    String warning = "Memory problem. Java Virtual Machine limits exceeded. Task was interrupted";
+                } catch (Exception e) {
+                    String warning = "Unhandled error. Task was interrupted";
                     monitor.warning(warning, e);
                     monitor.addReport(warning);
                 }
                 monitor.setResult(updateResult);
                 return updateResult;
-
             }
         };
         UUID uuid = progressMonitorService.registerNewRemotingMonitor(monitorThread);