diff --git a/CHANGELOG.md b/CHANGELOG.md index fb29c0499..a2f7b414b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). - Fixes bulk migration user roles association when there is no external userId assigned to the user - Bulk migration now actually uses the `isVerified` field's value in the loginMethod input +- Fixes nullpointer exception in bulk migration error handling in case of null external user id ## [10.1.3] diff --git a/src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkUsersImportWorker.java b/src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkUsersImportWorker.java index 7c55edfb4..38a578ace 100644 --- a/src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkUsersImportWorker.java +++ b/src/main/java/io/supertokens/cronjobs/bulkimport/ProcessBulkUsersImportWorker.java @@ -215,7 +215,7 @@ private static void handleBulkImportException(List usersBatch, B Map userIndexToError = exception.exceptionByUserId; for(String userid : userIndexToError.keySet()){ Optional userWithId = usersBatch.stream() - .filter(bulkImportUser -> bulkImportUser.id.equals(userid) || bulkImportUser.externalUserId.equals(userid)).findFirst(); + .filter(bulkImportUser -> userid.equals(bulkImportUser.id) || userid.equals(bulkImportUser.externalUserId)).findFirst(); String id = null; if(userWithId.isPresent()){ id = userWithId.get().id;