Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
bdd9d424
Commit
bdd9d424
authored
12 years ago
by
anttil
Browse files
Options
Downloads
Patches
Plain Diff
BIS-350 / SP-561: Expired download session message is handled as a real file
SVN: 28639
parent
82f7bb67
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
+4
-2
4 additions, 2 deletions
...is/dss/generic/server/AbstractDatasetDownloadServlet.java
with
4 additions
and
2 deletions
datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
+
4
−
2
View file @
bdd9d424
...
...
@@ -45,8 +45,8 @@ import ch.systemsx.cisd.openbis.common.io.hierarchical_content.api.IHierarchical
import
ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService
;
import
ch.systemsx.cisd.openbis.dss.generic.shared.dto.Size
;
import
ch.systemsx.cisd.openbis.dss.generic.shared.utils.ImageUtil
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.AbstractExternalData
;
import
ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance
;
/**
* Superclass for dataset download servlets. Provides functionality to deliver content of files and
...
...
@@ -210,6 +210,7 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
protected
final
static
void
printErrorResponse
(
final
HttpServletResponse
response
,
String
errorMessage
)
throws
IOException
{
response
.
setContentType
(
"text/html"
);
PrintWriter
writer
=
response
.
getWriter
();
writer
.
write
(
"<html><body>"
+
errorMessage
+
"</body></html>"
);
writer
.
flush
();
...
...
@@ -371,7 +372,8 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
return
map
;
}
protected
final
AbstractExternalData
tryToGetCachedDataSet
(
HttpSession
session
,
String
dataSetCode
)
protected
final
AbstractExternalData
tryToGetCachedDataSet
(
HttpSession
session
,
String
dataSetCode
)
{
return
getDataSets
(
session
).
get
(
dataSetCode
);
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment