From e76b6c7cada748a7b28934c94c24881d7887ca8b Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Thu, 25 Sep 2014 16:44:07 +0000 Subject: [PATCH] Fixed Final and Lock error git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-gwt-service@100207 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../gwtservice/server/TDGWTServiceImpl.java | 196 +++++++++--------- 1 file changed, 99 insertions(+), 97 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java index 376f03c..609dd1d 100644 --- a/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/td/gwtservice/server/TDGWTServiceImpl.java @@ -147,7 +147,6 @@ import org.gcube.portlets.user.td.gwtservice.shared.csv.CheckCSVSession; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsFinalException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTIsLockedException; import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTServiceException; -import org.gcube.portlets.user.td.gwtservice.shared.exception.TDGWTSessionExpiredException; import org.gcube.portlets.user.td.gwtservice.shared.extract.ExtractCodelistSession; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadMonitor; import org.gcube.portlets.user.td.gwtservice.shared.file.FileUploadState; @@ -293,7 +292,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setTRId(session, tabResource.getTrId()); return; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.error( @@ -319,21 +318,21 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements TabResource currentTR = SessionUtil.getTabResource(session); logger.debug("getCurrentTRId()"); if (currentTR == null) { - logger.error("CURRENT_TABULAR_RESOURCE is null"); + logger.error("Current Tabular Resource is null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE is null"); + "Current Tabular Resource is null"); } logger.debug("getCurrentTRId():" + currentTR.toString()); if (currentTR.getTrId() == null) { - logger.error("CURRENT_TABULAR_RESOURCE has TRId null"); + logger.error("Current Tabular Resource has TRId null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE has TRId null"); + "Current Tabular Resource has TRId null"); } logger.debug("getCurrentTRId():" + currentTR.getTrId()); return currentTR.getTrId(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -359,16 +358,16 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements TabResource currentTR = SessionUtil.getTabResource(session); if (currentTR == null) { - logger.error("CURRENT_TABULAR_RESOURCE is null"); + logger.error("Current Tabular Resource is null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE is null"); + "Current Tabular Resource is null"); } logger.debug("GetTabResourceInformation():" + currentTR.toString()); if (currentTR.getTrId() == null) { - logger.error("CURRENT_TABULAR_RESOURCE has TRId null"); + logger.error("Current Tabular Resource has TRId null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE has TRId null"); + "Current Tabular Resource has TRId null"); } logger.debug("Current TRId: " + currentTR.getTrId()); @@ -395,7 +394,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements + currentTR.toString()); return currentTR; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -455,7 +454,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements + currentTR); return currentTR; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -532,9 +531,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements TabResource currentTR = SessionUtil.getTabResource(session); if (currentTR == null) { - logger.error("CURRENT_TABULAR_RESOURCE is null"); + logger.error("Current Tabular Resource is null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE is null"); + "Current Tabular Resource is null"); } TRId trId = currentTR.getTrId(); @@ -628,7 +627,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return columns; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -746,7 +745,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return columns; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -868,7 +867,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return cData; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -990,7 +989,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return cData; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -1104,7 +1103,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Validation Column: " + columns.size()); return columns; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -1291,7 +1290,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("getLastTable: " + tData); return tData; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -1466,7 +1465,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("getTable: " + tData); return tData; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -1492,7 +1491,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setTDOpenSession(session, s); return; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.error("Error setting TDOpenSession parameter: " @@ -1801,7 +1800,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Codelists retrived: " + ltr); SessionUtil.setCodelistsPagingLoaded(session, ltr); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -1885,7 +1884,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Codelists retrieved: " + ltrTemp); return codelistPagingLoadResult; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2176,7 +2175,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Tabular Resources retrived: " + ltr); return ltr; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2234,7 +2233,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Tabular Resources retrieved: " + ltr); return ltr; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2287,7 +2286,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } return; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2334,7 +2333,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return tabResource; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2359,7 +2358,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements HttpSession session = this.getThreadLocalRequest().getSession(); return SessionUtil.retrieveCodelists(session); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { e.printStackTrace(); @@ -2377,7 +2376,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements HttpSession session = this.getThreadLocalRequest().getSession(); return SessionUtil.retrieveDatasets(session); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { e.printStackTrace(); @@ -2395,7 +2394,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements HttpSession session = this.getThreadLocalRequest().getSession(); return SessionUtil.retrieveAgencies(session); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { e.printStackTrace(); @@ -2480,7 +2479,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2546,7 +2545,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Retrieved TRId basic info:" + newTRId.toString()); return newTRId; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2570,7 +2569,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setSDMXRegistrySource(session, sdmxRegistrySource); return; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { @@ -2594,7 +2593,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setCSVImportSession(session, importSession); return; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.error( @@ -2757,7 +2756,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return taskId; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -2992,7 +2991,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return sdf.format(tr.getCreationDate().getTime()); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.error( @@ -3027,7 +3026,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("IsTabularResourceValid: " + tr.isValid()); return tr.isValid(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3066,7 +3065,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .getId()))); logger.debug("IsTabularResourceFinalized: " + tr.isFinalized()); return tr.isFinalized(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3106,7 +3105,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .getId()))); logger.debug("IsTabularResourceLocked: " + tr.isLocked()); return tr.isLocked(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3215,7 +3214,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("GetTRMetadata: [" + listTRMetadata + "]"); return listTRMetadata; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3273,7 +3272,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("TabValidationsMetadata: " + tabValidationsMetadata); return tabValidationsMetadata; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3404,7 +3403,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return listTabMetadata; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.error( @@ -3520,8 +3519,11 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .getTabularResource(tabularResourceId); if (tabularResource.isLocked()) { + logger.error("Tabular Resource Is Locked"); throw new TDGWTIsLockedException("Tabular Resource Is Locked"); } + } catch (TDGWTServiceException e){ + throw e; } catch (SecurityException e) { throw e; } catch (Throwable e) { @@ -3546,9 +3548,12 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements .getTabularResource(tabularResourceId); if (tabularResource.isFinalized()) { + logger.error("Tabular Resource Is Final"); throw new TDGWTIsFinalException("Tabular Resource Is Final"); } + } catch (TDGWTServiceException e){ + throw e; } catch (SecurityException e) { throw e; } catch (Throwable e) { @@ -3620,7 +3625,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3696,7 +3701,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3758,7 +3763,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3813,7 +3818,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3870,7 +3875,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -3940,7 +3945,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4016,7 +4021,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4071,7 +4076,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4131,7 +4136,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4247,7 +4252,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } } return columns; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4303,7 +4308,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4392,7 +4397,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4447,7 +4452,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4503,7 +4508,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements ShareInfo shareInfo = new ShareInfo(tabResource, contacts); return shareInfo; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4551,7 +4556,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Share with Users: " + users); service.share(tabularResourceId, usersArray); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4580,7 +4585,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return tr.isFinalized(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4696,7 +4701,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } logger.debug("setTabResourceInformation - new information:" + tr); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4737,7 +4742,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Retrieved Occurences"); return occurences; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4800,7 +4805,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return templateDataList; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4849,7 +4854,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -4886,7 +4891,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements service.remove(templateId); } - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (NoSuchTemplateException e) { logger.debug("Error StartTemplateDelete: No such Template"); @@ -4950,7 +4955,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5016,7 +5021,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5050,7 +5055,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("locales :" + locales); return locales; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.debug("getLocales(): " + e.getLocalizedMessage()); @@ -5074,9 +5079,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("getLastOperationInfo()"); TabResource currentTR = SessionUtil.getTabResource(session); if (currentTR == null) { - logger.error("CURRENT_TABULAR_RESOURCE is null"); + logger.error("Current Tabular Resource is null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE is null"); + "Current Tabular Resource is null"); } TRId trId = currentTR.getTrId(); @@ -5109,7 +5114,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Last Operation Info :" + op); return op; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5167,7 +5172,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Last Operation Info :" + op); return op; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5195,9 +5200,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("getHistory()"); TabResource currentTR = SessionUtil.getTabResource(session); if (currentTR == null) { - logger.error("CURRENT_TABULAR_RESOURCE is null"); + logger.error("Current Tabular Resource is null"); throw new TDGWTServiceException( - "CURRENT_TABULAR_RESOURCE is null"); + "Current Tabular Resource is null"); } TRId trId = currentTR.getTrId(); @@ -5231,7 +5236,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("History :" + opHistoryList); return opHistoryList; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5289,7 +5294,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("History :" + opHistoryList); return opHistoryList; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5358,7 +5363,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return taskId; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5410,7 +5415,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5503,7 +5508,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("ValidationsTasksMetadata: " + validationsTasksMetadata); return validationsTasksMetadata; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5557,7 +5562,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5611,7 +5616,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements ColumnData columnData = getColumn(refColumn.getColumnId(), trId); return columnData; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.debug("Error in getConnection(): " + e.getLocalizedMessage()); @@ -5658,7 +5663,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5798,7 +5803,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5858,7 +5863,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5919,7 +5924,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -5982,7 +5987,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6006,7 +6011,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements codelistMappingSession); return; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { logger.error( @@ -6137,7 +6142,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements aslSession, user, codelistMappingSession); return taskId; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6260,7 +6265,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6317,7 +6322,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6378,7 +6383,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6432,7 +6437,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements SessionUtil.setStartedTask(session, taskWrapper); return trTask.getId().getValue(); - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6468,8 +6473,6 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("OperationMonitor(): " + operationMonitor); return operationMonitor; - } catch (TDGWTSessionExpiredException e) { - throw e; } catch (TDGWTServiceException e) { throw e; } catch (Throwable e) { @@ -6502,7 +6505,7 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements logger.debug("Licences: " + licences.size()); return licences; - } catch (TDGWTSessionExpiredException e) { + } catch (TDGWTServiceException e) { throw e; } catch (SecurityException e) { e.printStackTrace(); @@ -6563,10 +6566,9 @@ public class TDGWTServiceImpl extends RemoteServiceServlet implements } return backgroundOperationMonitorList; - } catch (TDGWTSessionExpiredException e) { - throw e; } catch (TDGWTServiceException e) { throw e; + } catch (Throwable e) { e.printStackTrace(); throw new TDGWTServiceException(