Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=10.0.0
version=10.0.1
SONATYPE_CONNECT_TIMEOUT_SECONDS=120
8 changes: 0 additions & 8 deletions src/main/java/com/configcat/ConfigCatClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -350,19 +350,11 @@ public CompletableFuture<RefreshResult> forceRefreshAsync() {

@Override
public void setDefaultUser(User defaultUser) {
if (isClosed()) {
logger.warn(3201, ConfigCatLogMessages.getConfigServiceMethodHasNoEffectDueToClosedClient("setDefaultUser"));
return;
}
this.defaultUser = defaultUser;
}

@Override
public void clearDefaultUser() {
if (isClosed()) {
logger.warn(3201, ConfigCatLogMessages.getConfigServiceMethodHasNoEffectDueToClosedClient("clearDefaultUser"));
return;
}
this.defaultUser = null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/configcat/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ private Constants() { /* prevent from instantiation*/ }
static final long DISTANT_PAST = 0;
static final String CONFIG_JSON_NAME = "config_v6.json";
static final String SERIALIZATION_FORMAT_VERSION = "v2";
static final String VERSION = "10.0.0";
static final String VERSION = "10.0.1";

static final String SDK_KEY_PROXY_PREFIX = "configcat-proxy/";
static final String SDK_KEY_PREFIX = "configcat-sdk-1";
Expand Down
39 changes: 37 additions & 2 deletions src/test/java/com/configcat/ConfigCatClientTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ private static OkHttpClient getFetcherClientWithReflection(ConfigCatClient clien
configServiceField.setAccessible(true);
ConfigService configService = (ConfigService) configServiceField.get(client);

Field configFetcherField = ConfigService.class.getDeclaredField("configFetcher");
Field configFetcherField = configService.getClass().getDeclaredField("configFetcher");
configFetcherField.setAccessible(true);
ConfigFetcher configFetcher = (ConfigFetcher) configFetcherField.get(configService);

Expand Down Expand Up @@ -1112,5 +1112,40 @@ void testWaitForReady() throws IOException, InterruptedException, ExecutionExcep
cl.close();
}

@Test
void getValueAfterCloseWithDefaultUserAndClearedUser() throws IOException {
MockWebServer server = new MockWebServer();
server.start();

User user1 = User.newBuilder().build("test1");
User user2 = User.newBuilder().build("test2");

ConfigCatClient cl = ConfigCatClient.get(Helpers.SDK_KEY, options -> {
options.pollingMode(PollingModes.manualPoll());
options.baseUrl(server.url("/").toString());
});

server.enqueue(new MockResponse().setResponseCode(200).setBody(TEST_JSON_DEFAULT_USER));
cl.forceRefresh();

cl.setDefaultUser(user1);

String result = assertDoesNotThrow(() -> cl.getValue(String.class, "fakeKey", "fallback"));
assertEquals("fakeValue1", result);

cl.close();

cl.setDefaultUser(user2);

result = assertDoesNotThrow(() -> cl.getValue(String.class, "fakeKey", "fallback"));
assertEquals("fakeValue2", result);

cl.clearDefaultUser();

result = assertDoesNotThrow(() -> cl.getValue(String.class, "fakeKey", "fallback"));
assertEquals("defaultValue", result);
}


}

}