private void merge(ConfigurationChanges diffs, ApplicationEntity prev, ApplicationEntity ae, String deviceDN, boolean preserveVendorData) throws NamingException { String aeDN = aetDN(ae.getAETitle(), deviceDN); ConfigurationChanges.ModifiedObject ldapObj = ConfigurationChanges.addModifiedObject(diffs, aeDN, ConfigurationChanges.ChangeType.U); modifyAttributes(aeDN, storeDiffs(ldapObj, prev, ae, deviceDN, new ArrayList<ModificationItem>(), preserveVendorData)); ConfigurationChanges.removeLastIfEmpty(diffs, ldapObj); mergeChilds(diffs, prev, ae, aeDN); }
private void merge(ConfigurationChanges diffs, ApplicationEntity prev, ApplicationEntity ae, String deviceDN, boolean preserveVendorData) throws NamingException { String aeDN = aetDN(ae.getAETitle(), deviceDN); ConfigurationChanges.ModifiedObject ldapObj = ConfigurationChanges.addModifiedObject(diffs, aeDN, ConfigurationChanges.ChangeType.U); modifyAttributes(aeDN, storeDiffs(ldapObj, prev, ae, deviceDN, new ArrayList<ModificationItem>(), preserveVendorData)); ConfigurationChanges.removeLastIfEmpty(diffs, ldapObj); mergeChilds(diffs, prev, ae, aeDN); }
storeDiffs(ldapObj, prev, device, new ArrayList<ModificationItem>(), preserveVendorData)); ConfigurationChanges.removeLastIfEmpty(diffs, ldapObj); mergeChilds(diffs, prev, device, deviceDN, preserveVendorData); destroyDNs.clear(); if (register) {
storeDiffs(ldapObj, prev, device, new ArrayList<ModificationItem>(), preserveVendorData)); ConfigurationChanges.removeLastIfEmpty(diffs, ldapObj); mergeChilds(diffs, prev, device, deviceDN, preserveVendorData); destroyDNs.clear(); if (register) {