opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-1922 Resource controller implementation

Browse Source
This commit is contained in:
serge-rider
2022-04-21 20:41:14 +03:00
parent 0f9997e6d2
commit 91ec60a924
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/model/rm/local/LocalResourceController.java
+5 -3
View File
@@ -21,6 +21,7 @@ import org.jkiss.code.NotNull;
import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.DBException;
import org.jkiss.dbeaver.Log;
import org.jkiss.dbeaver.model.auth.SMCredentials;
import org.jkiss.dbeaver.model.auth.SMCredentialsProvider;
import org.jkiss.dbeaver.model.exec.DBCFeatureNotSupportedException;
import org.jkiss.dbeaver.model.rm.RMController;
@@ -72,8 +73,9 @@ public class LocalResourceController implements RMController {
}
private Path getPrivateProjectPath() {
String userId = credentialsProvider.getSMAuthToken();
return this.userProjectsPath.resolve(userId);
SMCredentials activeUserCredentials = credentialsProvider.getActiveUserCredentials();
String userId = activeUserCredentials == null ? null : activeUserCredentials.getUserId();
return userId == null ? null : this.userProjectsPath.resolve(userId);
}
@NotNull
@@ -99,7 +101,7 @@ public class LocalResourceController implements RMController {
}
private RMProject makeProjectFromPath(Path path, String prefix) {
if (!Files.exists(path) || !Files.isDirectory(path)) {
if (path == null || !Files.exists(path) || !Files.isDirectory(path)) {
return null;
}
RMProject project = new RMProject();