Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CB-3968 prettify error #2862

Merged
merged 3 commits into from
Aug 26, 2024
Merged

CB-3968 prettify error #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
762d641
CB-3968 prettify error
yagudin10 Aug 21, 2024
caaf34d
Merge branch 'devel' into CB-3968-script-renaming-make-error-about-th…
EvgeniaBzzz Aug 23, 2024
8e9db60
CB-3968 return only rm error message
yagudin10 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...ndles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,9 @@ public String moveResource(
}
Path newTargetPath = getTargetPath(projectId, normalizedNewResourcePath);
validateResourcePath(newTargetPath.toString());
if (Files.exists(newTargetPath)) {
throw new DBException("Resource with name %s already exists".formatted(newTargetPath.getFileName()));
}
try {
Files.move(oldTargetPath, newTargetPath);
} catch (IOException e) {
Expand Down
2 changes: 1 addition & 1 deletion ...er/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/impl/WebServiceRM.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ public boolean moveResource(@NotNull WebSession webSession,
WSResourceProperty.NAME);
return true;
} catch (Exception e) {
throw new DBWebException("Error moving resource " + oldResourcePath, e);
throw new DBWebException(e.getMessage(), e);
}
}

Expand Down
Loading