Merge branch 'master' of git://github.com/ahirsh/intercom-java into savicprvoslav-master

mmartinic · mmartinic · commit 19da83b2cc35 · 2016-10-02T22:28:19.000+01:00
diff --git a/intercom-java/src/main/java/io/intercom/api/CompanyUpdateBuilder.java b/intercom-java/src/main/java/io/intercom/api/CompanyUpdateBuilder.java
@@ -16,7 +16,9 @@ static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection ad
         if (add != null) {
             final List<Company> companies = add.getPage();
             for (Company company : companies) {
-                updatableCompanies.add(prepareUpdatableCompany(company));
+                if(remove!=null && !remove.getPage().contains(company)){
+                    updatableCompanies.add(prepareUpdatableCompany(company));
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ static List<CompanyWithStringPlan> buildUserUpdateCompanies(CompanyCollection ad`
`16`	`16`	`if (add != null) {`
`17`	`17`	`final List<Company> companies = add.getPage();`
`18`	`18`	`for (Company company : companies) {`
`19`		`- updatableCompanies.add(prepareUpdatableCompany(company));`
	`19`	`+ if(remove!=null && !remove.getPage().contains(company)){`
	`20`	`+ updatableCompanies.add(prepareUpdatableCompany(company));`
	`21`	`+ }`
`20`	`22`	`}`
`21`	`23`	`}`
`22`	`24`