Post-merge fix.

Evolveum · Feb 27, 2015 · 0ac3c1e · 0ac3c1e
1 parent e698ba8
commit 0ac3c1e
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java b/...l/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
@@ -1662,6 +1662,7 @@ public void deleteObject(ObjectClassComplexTypeDefinition objectClass,
 			Collection<Operation> additionalOperations, Collection<? extends ResourceAttribute<?>> identifiers,
 			OperationResult parentResult) throws ObjectNotFoundException, CommunicationException,
 			GenericFrameworkException {
+		Validate.notNull(objectClass, "No objectclass");
 
 		OperationResult result = parentResult.createSubresult(ConnectorInstance.class.getName()
 				+ ".deleteObject");
@@ -1983,7 +1984,7 @@ public boolean handle(ConnectorObject connectorObject) {
         	// DN. And DN is usually stored in icfs:name. This is ugly, but practical. It works around ConnId problems.
         	ResourceAttribute<?> secondaryIdentifier = ShadowUtil.getSecondaryIdentifier(objectClassDefinition, baseContextIdentification.getIdentifiers());
         	String secondaryIdentifierValue = secondaryIdentifier.getRealValue(String.class);
-        	ObjectClass baseContextIcfObjectClass = icfNameMapper.objectClassToIcf(baseContextIdentification.getObjectClassDefinition(), getSchemaNamespace(), connectorType);
+        	ObjectClass baseContextIcfObjectClass = icfNameMapper.objectClassToIcf(baseContextIdentification.getObjectClassDefinition(), getSchemaNamespace(), connectorType, legacySchema);
         	QualifiedUid containerQualifiedUid = new QualifiedUid(baseContextIcfObjectClass, new Uid(secondaryIdentifierValue));
 			optionsBuilder.setContainer(containerQualifiedUid);
         }