fixed merge

This commit is contained in:
Luca Frosini 2021-04-14 15:11:37 +02:00
parent 0f4e45422c
commit 908fe07fd5
2 changed files with 6 additions and 6 deletions

View File

@ -2,11 +2,11 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
# Changelog for gCube Catalogue (gCat) Client
## [v2.0.0-SNAPSHOT]
- Changed service class
## [v1.2.2]
- Added count method for Item collection [#20627]

View File

@ -31,7 +31,7 @@ public class ContextTest {
protected static final String GCAT_PROPERTIES_FILENAME = "gcat.properties";
public static final String GCAT_URL_PROPERTY = "GCAT_URL_PROPERTY";
public static final String GCAT_URL;
public static String GCAT_URL;
public static final String DEFAULT_TEST_CONTEXT_NAME;
@ -61,12 +61,12 @@ public class ContextTest {
try {
// load the properties file
gcatProperties.load(input);
} catch (IOException e) {
throw new RuntimeException(e);
GCAT_URL = gcatProperties.getProperty(GCAT_URL_PROPERTY);
} catch (Exception e) {
// throw new RuntimeException(e);
GCAT_URL = null;
}
GCAT_URL = gcatProperties.getProperty(GCAT_URL_PROPERTY);
if(GCAT_URL!=null){
try {
GCatClientDiscovery.forceToURL(GCAT_URL);