Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
vollt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sonia Zorba
vollt
Commits
766b36fc
Commit
766b36fc
authored
4 years ago
by
gmantele
Browse files
Options
Downloads
Patches
Plain Diff
[UWS] Fix JobInfo destruction when no file associated
parent
3f246d19
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/uws/job/jobInfo/XMLJobInfo.java
+32
-30
32 additions, 30 deletions
src/uws/job/jobInfo/XMLJobInfo.java
with
32 additions
and
30 deletions
src/uws/job/jobInfo/XMLJobInfo.java
+
32
−
30
View file @
766b36fc
...
@@ -16,7 +16,7 @@ package uws.job.jobInfo;
...
@@ -16,7 +16,7 @@ package uws.job.jobInfo;
* You should have received a copy of the GNU Lesser General Public License
* You should have received a copy of the GNU Lesser General Public License
* along with UWSLibrary. If not, see <http://www.gnu.org/licenses/>.
* along with UWSLibrary. If not, see <http://www.gnu.org/licenses/>.
*
*
* Copyright 2017-20
19
- Astronomisches Rechen Institut (ARI),
* Copyright 2017-20
20
- Astronomisches Rechen Institut (ARI),
* UDS/Centre de Données astronomiques de Strasbourg (CDS)
* UDS/Centre de Données astronomiques de Strasbourg (CDS)
*/
*/
...
@@ -142,7 +142,7 @@ import uws.service.request.UploadFile;
...
@@ -142,7 +142,7 @@ import uws.service.request.UploadFile;
* </p>
* </p>
*
*
* @author Grégory Mantelet (ARI;CDS)
* @author Grégory Mantelet (ARI;CDS)
* @version 4.
4
(0
3
/20
19
)
* @version 4.
5
(0
5
/20
20
)
* @since 4.2
* @since 4.2
*/
*/
public
class
XMLJobInfo
implements
JobInfo
{
public
class
XMLJobInfo
implements
JobInfo
{
...
@@ -323,12 +323,14 @@ public class XMLJobInfo implements JobInfo {
...
@@ -323,12 +323,14 @@ public class XMLJobInfo implements JobInfo {
@Override
@Override
public
void
destroy
()
throws
UWSException
{
public
void
destroy
()
throws
UWSException
{
if
(
file
!=
null
)
{
try
{
try
{
file
.
deleteFile
();
file
.
deleteFile
();
}
catch
(
IOException
ioe
)
{
}
catch
(
IOException
ioe
)
{
throw
new
UWSException
(
UWSException
.
INTERNAL_SERVER_ERROR
,
ioe
,
"Error when deleting a JobInfo file!"
);
throw
new
UWSException
(
UWSException
.
INTERNAL_SERVER_ERROR
,
ioe
,
"Error when deleting a JobInfo file!"
);
}
}
}
}
}
/**
/**
* Serialize this {@link XMLJobInfo}.
* Serialize this {@link XMLJobInfo}.
...
...
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