Fix bad merge conflict in `LogManagerDDVController_jni.cpp`
@@ -14,7 +14,8 @@ extern "C"
JNIEnv* env,
jclass /* this */,
jstring jstrMachineIdentifier,
- jstring jstrEndpoint) {
+ jstring jstrEndpoint)
+{
auto machineIdentifier = JStringToStdString(env, jstrMachineIdentifier);
auto endpoint = JStringToStdString(env, jstrEndpoint);
std::shared_ptr<DefaultDataViewer> spDefaultDataViewer = std::make_shared<DefaultDataViewer>(nullptr, machineIdentifier);
@@ -26,19 +27,19 @@ extern "C"
else {
return false;
}
+}
JNIEXPORT void JNICALL Java_com_microsoft_applications_events_LogManager_disableViewer(
JNIEnv* env,
- jclass /* this */) {
+ jclass /* this */)
+{
LogManager::GetDataViewerCollection().UnregisterAllViewers();
}
JNIEXPORT jboolean JNICALL Java_com_microsoft_applications_events_LogManager_isViewerEnabled(
JNIEnv* env,
- jclass /* this */) {
+ jclass /* this */)
+{
return LogManager::GetDataViewerCollection().IsViewerEnabled();
-}
-
- return "";
}
}
\ No newline at end of file
