8000 Fix: Some suggested changes related to ODP by mnoman09 · Pull Request #325 · optimizely/csharp-sdk · GitHub
[go: up one dir, main page]
Skip to content

Fix: Some suggested changes related to ODP #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 25, 2023
Merged

Fix: Some suggested changes related to ODP #325

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
63e9afb
Some suggested changes to fix null pointer exception
NomanShoaib Jan 19, 2023
eae067a
- Removed batchsize support from ODP event manager
NomanShoaib Jan 20, 2023
c196883
Merge branch 'mike/odp-usercontext-optimizelyclient' into mnoman/odp_…
NomanShoaib Jan 23, 2023
12821a1
Flush previous event
NomanShoaib Jan 23, 2023
c9916db
Merge branch 'mike/odp-usercontext-optimizelyclient' into mnoman/odp_…
NomanShoaib Jan 23, 2023
f0ea639
reverting this change
NomanShoaib Jan 23, 2023
55b1ed2
Merge branch 'mike/odp-usercontext-optimizelyclient' into mnoman/odp_…
mnoman09 Jan 24, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'mike/odp-usercontext-optimizelyclient' into mnoman/odp_… 
…suggested_changes

# Conflicts:
#
8000
	OptimizelySDK/Odp/OdpEventManager.cs
#	OptimizelySDK/Optimizely.cs
  • Loading branch information
@NomanShoaib
NomanShoaib committed Jan 23, 2023
commit c196883d7c1cb7d76a910a296c5903255d8e2169
7 changes: 4 additions & 3 deletions OptimizelySDK/Odp/OdpEventManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,9 +480,10 @@ public OdpEventManager Build()
var manager = new OdpEventManager();
manager._eventQueue = _eventQueue;
manager._odpEventApiManager = _odpEventApiManager;
manager._flushInterval = (_flushInterval != null && _flushInterval > TimeSpan.FromSeconds(0)) ? _flushInterval : Constants.DEFAULT_FLUSH_INTERVAL;
manager._batchSize = (_flushInterval != null && _flushInterval == TimeSpan.FromSeconds(0)) ? 1 : Constants.DEFAULT_BATCH_SIZE;
manager._timeoutInterval = _timeoutInterval <= TimeSpan.FromSeconds(0) ?
manager._flushInterval = _flushInterval < TimeSpan.Zero ?
Constants.DEFAULT_FLUSH_INTERVAL :
_flushInterval;
manager._timeoutInterval = _timeoutInterval <= TimeSpan.Zero ?
Constants.DEFAULT_TIMEOUT_INTERVAL :
_timeoutInterval;
manager._logger = _logger ?? new NoOpLogger();
Expand Down
2 changes: 1 addition & 1 deletion OptimizelySDK/Optimizely.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ private void InitializeComponents(IEventDispatcher eventDispatcher = null,
DefaultDecideOptions = defaultDecideOptions ?? new OptimizelyDecideOption[]
{ };
#if USE_ODP
OdpManager = odpManager;
OdpManager = odpManager ?? new NoOpOdpManager();
#endif
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0