Merge branch 'master' into master-cadpro

src/com/yonde/common/DxSearchUtil.java

@@ -242,7 +242,7 @@ public class DxSearchUtil implements RemoteAccess, Serializable {
                 TypeDefinitionReference tdr = TypedUtility.getTypeDefinitionReference(typeName);
                 if (ObjectsUtil.nonNull(tdr)) {
                     addQuerySpecOp(querySpec, operator);
-                    SearchCondition typeDefinitionCondition = new SearchCondition(WTDocument.class,
+                    SearchCondition typeDefinitionCondition = new SearchCondition(clazz,
                             WTDocument.TYPE_DEFINITION_REFERENCE + "." + TypeDefinitionReference.KEY + "." + TypeDefinitionForeignKey.BRANCH_ID,
                             SearchCondition.EQUAL, tdr.getKey().getBranchId());
                     querySpec.appendWhere(typeDefinitionCondition, new int[]{0});