Skip to content
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

Jump to bottom

factory: fix NPE in BusinessTagDao #101

Merged
merged 1 commit into from
Aug 13, 2019
Merged

factory: fix NPE in BusinessTagDao #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions src/main/java/org/killbill/billing/plugin/analytics/dao/factory/BusinessTagFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
/*
* Copyright 2010-2014 Ning, Inc.
* Copyright 2014 The Billing Project, LLC
* Copyright 2014-2019 Groupon, Inc
* Copyright 2014-2019 The Billing Project, LLC
*
* Ning licenses this file to you under the Apache License, version 2.0
* The Billing Project licenses this file to you under the Apache License, version 2.0
* (the "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
*
Expand Down Expand Up @@ -73,7 +74,9 @@ public BusinessModelDaosWithAccountAndTenantRecordId<BusinessTagModelDao> create
creationAuditLog,
tenantRecordId,
reportGroup);
tagModelDaos.add(tagModelDao);
if (tagModelDao != null) {
tagModelDaos.add(tagModelDao);
}
}

return new BusinessModelDaosWithAccountAndTenantRecordId<BusinessTagModelDao>(accountRecordId, tenantRecordId, tagModelDaos);
Expand Down