From c3f8cb442d4768fdb4bcd1ac83cec4f885a9405c Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 10 Oct 2017 10:27:59 +0000 Subject: [PATCH] Removed markAsRead method git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/workspace-explorer-app@155055 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 16 ++++++++-------- .settings/org.eclipse.jdt.core.prefs | 2 +- distro/changelog.xml | 4 ++++ pom.xml | 2 +- .../server/DownloadWorkspaceExplorerServlet.java | 10 ++++------ 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.classpath b/.classpath index 87808b4..8469ccd 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -22,16 +22,16 @@ - - - - - - + + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index 443e085..b257af7 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,6 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/distro/changelog.xml b/distro/changelog.xml index ddedca9..f54cd2b 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Removed markAsRead method. It is performed by HL + [Task #9104] removed log4j.properties file diff --git a/pom.xml b/pom.xml index c50acfc..77309b8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.gcube.portlets.user workspace-explorer-app - 1.0.1-SNAPSHOT + 1.0.2-SNAPSHOT war diff --git a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/DownloadWorkspaceExplorerServlet.java b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/DownloadWorkspaceExplorerServlet.java index 5374a26..d2179c7 100644 --- a/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/DownloadWorkspaceExplorerServlet.java +++ b/src/main/java/org/gcube/portlets/user/workspaceexplorerapp/server/DownloadWorkspaceExplorerServlet.java @@ -149,17 +149,15 @@ public class DownloadWorkspaceExplorerServlet extends HttpServlet{ return; } - try{ - //ACCOUNTING - item.markAsRead(true); - } catch (InternalErrorException e) { - logger.error("Requested item "+itemIds+" has thrown an internal error exception",e); - } } catch (ItemNotFoundException e) { logger.error("Requested item "+itemIds+" not found",e); handleError(urlRedirectOnError, req, resp, itemIds, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": The file has been deleted by another user."); return; + } catch (Exception e) { + logger.error("Error during item retrieving "+itemIds,e); + handleError(urlRedirectOnError, req, resp, itemIds, HttpServletResponse.SC_INTERNAL_SERVER_ERROR +": Error during data retrieving: "+e.getMessage()); + return; } switch (item.getType()) {