Skip to content

Commit 7c19bc9

Browse files
committed
fixup: fxiing npe and missing flagdir
Signed-off-by: Simon Schrottner <[email protected]>
1 parent 1170f41 commit 7c19bc9

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

providers/flagd/src/main/java/dev/openfeature/contrib/providers/flagd/resolver/process/InProcessResolver.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import java.util.Map;
2929
import java.util.function.Consumer;
3030
import lombok.extern.slf4j.Slf4j;
31+
import org.apache.commons.lang3.StringUtils;
3132

3233
/**
3334
* Resolves flag values using
@@ -204,7 +205,7 @@ private <T> ProviderEvaluation<T> resolve(Class<T> type, String key, EvaluationC
204205
// check variant existence
205206
Object value = flag.getVariants().get(resolvedVariant);
206207
if (value == null) {
207-
if (resolvedVariant.isEmpty() && flag.getDefaultVariant().isEmpty()) {
208+
if (StringUtils.isEmpty(resolvedVariant) && StringUtils.isEmpty(flag.getDefaultVariant())) {
208209
return ProviderEvaluation.<T>builder()
209210
.reason(Reason.ERROR.toString())
210211
.errorCode(ErrorCode.FLAG_NOT_FOUND)

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/ProviderSteps.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public static void beforeAll() throws IOException {
4646
sharedTempDir = Files.createDirectories(
4747
Paths.get("tmp/" + RandomStringUtils.randomAlphanumeric(8).toLowerCase() + "/"));
4848
container = new ComposeContainer(new File("test-harness/docker-compose.yaml"))
49+
.withEnv("FLAGS_DIR", sharedTempDir.toAbsolutePath().toString())
4950
.withExposedService("flagd", 8013, Wait.forListeningPort())
5051
.withExposedService("flagd", 8015, Wait.forListeningPort())
5152
.withExposedService("flagd", 8080, Wait.forListeningPort())

0 commit comments

Comments
 (0)