Skip to content

Commit 16a70cc

Browse files
Merge branch 'farhan-anjum/FSSDK-11170-decision-service-methods-for-cmab' into farhan-anjum/FSSDK-11179-update-impression-event
2 parents d0a2b59 + 8539166 commit 16a70cc

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

core-api/src/main/java/com/optimizely/ab/Optimizely.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1458,7 +1458,10 @@ private Map<String, OptimizelyDecision> decideForKeys(@Nonnull OptimizelyUserCon
14581458
for (int i = 0; i < flagsWithoutForcedDecision.size(); i++) {
14591459
DecisionResponse<FeatureDecision> decision = decisionList.get(i);
14601460
boolean error = decision.isError();
1461-
String experimentKey = decision.getResult().experiment.getKey();
1461+
String experimentKey = null;
1462+
if (decision.getResult() != null && decision.getResult().experiment != null) {
1463+
experimentKey = decision.getResult().experiment.getKey();
1464+
}
14621465
String flagKey = flagsWithoutForcedDecision.get(i).getKey();
14631466

14641467
if (error) {

core-api/src/test/java/com/optimizely/ab/OptimizelyTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5044,7 +5044,7 @@ public void testDecideReturnsErrorDecisionWhenDecisionServiceFails() throws Exce
50445044
assertNull(decision.getVariationKey());
50455045
assertNull(decision.getRuleKey());
50465046
assertEquals("feature_1", decision.getFlagKey());
5047-
assertTrue(decision.getReasons().contains("Decision service error occured for key \"feature_1\"."));
5047+
assertTrue(decision.getReasons().contains("Failed to fetch CMAB data for experiment exp-cmab."));
50485048
}
50495049

50505050
}

0 commit comments

Comments
 (0)