CB-2502 Global project detection fixed

serge-rider · serge-rider · commit ad31a853aae1 · 2022-09-01T10:22:18.000+02:00
diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java
@@ -43,6 +43,7 @@
 import org.jkiss.dbeaver.model.navigator.DBNProject;
 import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;
 import org.jkiss.dbeaver.model.net.ssh.SSHConstants;
+import org.jkiss.dbeaver.model.rm.RMProject;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceNavigatorSettings;
 import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;
@@ -343,7 +344,7 @@ public static void updateConfigAndRefreshDatabases(WebSession session, String pr
     }
 
     public static boolean isGlobalProject(DBPProject project) {
-        return CommonUtils.equalObjects(CBApplication.getInstance().getDefaultProjectName(), project.getName());
+        return project.getId().equals(RMProject.PREFIX_GLOBAL + "_" + CBApplication.getInstance().getDefaultProjectName());
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`import org.jkiss.dbeaver.model.navigator.DBNProject;`
`44`	`44`	`import org.jkiss.dbeaver.model.net.DBWHandlerConfiguration;`
`45`	`45`	`import org.jkiss.dbeaver.model.net.ssh.SSHConstants;`
	`46`	`+import org.jkiss.dbeaver.model.rm.RMProject;`
`46`	`47`	`import org.jkiss.dbeaver.registry.DataSourceDescriptor;`
`47`	`48`	`import org.jkiss.dbeaver.registry.DataSourceNavigatorSettings;`
`48`	`49`	`import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;`
`@@ -343,7 +344,7 @@ public static void updateConfigAndRefreshDatabases(WebSession session, String pr`
`343`	`344`	`}`
`344`	`345`
`345`	`346`	`public static boolean isGlobalProject(DBPProject project) {`
`346`		`- return CommonUtils.equalObjects(CBApplication.getInstance().getDefaultProjectName(), project.getName());`
	`347`	`+ return project.getId().equals(RMProject.PREFIX_GLOBAL + "_" + CBApplication.getInstance().getDefaultProjectName());`
`347`	`348`	`}`
`348`	`349`
`349`	`350`