Skip to content

Commit 6f02e62

Browse files
committed
Fix mirror bug
1 parent 7fdb964 commit 6f02e62

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

bundles/server/database.sql/src/com/arcadsoftware/database/sql/DataSourceFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
*/
4141
public class DataSourceFactory {
4242

43+
private static ServiceLoader<IDataSourceProvider> loader = ServiceLoader.load(IDataSourceProvider.class);
44+
4345
/**
4446
*
4547
* @param databaseID
@@ -106,7 +108,6 @@ public static DataSource createDataSource(ILoggedPlugin activator, DataSourcePar
106108
}
107109
}
108110
}
109-
ServiceLoader<IDataSourceProvider> loader = ServiceLoader.load(IDataSourceProvider.class);
110111
if (loader != null) {
111112
Iterator<IDataSourceProvider> itt = loader.iterator();
112113
while (itt.hasNext()) {

bundles/server/metadata.rest/src/com/arcadsoftware/metadata/rest/internal/MetaDataParentResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ private int doCreateTest(List<IMetaDataModifyListener> listeners, List<IMetaData
705705
}
706706
// As result values have been already converted we just have to test that String values are not empty, other types are set to null.
707707
Object v = result.get(a.getCode());
708-
if ((v == null) || (v instanceof String s) && s.isBlank()) {
708+
if ((v == null) || ((v instanceof String s) && s.isBlank())) {
709709
return 0;
710710
}
711711
}

0 commit comments

Comments
 (0)