fixup! Fix versioning appliance for vehicle datafix/sdl_versioning_for_vehicle_data_rebased

2 files changed, 7 insertions, 9 deletions

diff --git a/src/components/include/utils/semantic_version.h b/src/components/include/utils/semantic_version.h
index d434562d5d..01b04495ad 100644
--- a/src/components/include/utils/semantic_version.h
+++ b/src/components/include/utils/semantic_version.h
@@ -57,12 +57,10 @@ struct SemanticVersion {
                               &minor_version_,
                               &patch_version_);
 
-    if (readElements != 3) {
-      if (readElements != 2) {
-        major_version_ = 0;
-        minor_version_ = 0;
-        patch_version_ = 0;
-      }
+    if (readElements < 2) {
+      major_version_ = 0;
+      minor_version_ = 0;
+      patch_version_ = 0;
     }
   }
 
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index 437e0c708f..4c387b6bbb 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -94,7 +94,7 @@ bool SMember::CheckHistoryFieldVersion(
     }
   }
 
-  return true;  // Not enough version information. Default true.
+  return true;  // All checks passed. Return true.
 }
 
 std::shared_ptr<CObjectSchemaItem> CObjectSchemaItem::create(
@@ -265,8 +265,8 @@ void CObjectSchemaItem::RemoveFakeParams(
       continue;
     }
 
-    if (mMembers.end() == members_it && key.compare(connection_key) != 0 &&
-        key.compare(binary_data) != 0 && key.compare(app_id) != 0) {
+    else if (key.compare(connection_key) != 0 &&
+             key.compare(binary_data) != 0 && key.compare(app_id) != 0) {
       Object.erase(key);
     }
   }