Fix logical condition in AsyncJobDaoImpl and ResourceIdSupport

Author: mprokopchuk

framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java

@@ -153,7 +153,7 @@ public List<AsyncJobVO> findInstancePendingAsyncJobs(String instanceType, Long a
     public AsyncJobVO findJob(Long id, Long resourceId, String resourceType) {
         SearchCriteria<AsyncJobVO> sc = byIdResourceIdResourceTypeSearch.create();
 
-        if (id == null && resourceId == null && StringUtils.isNotBlank(resourceType)) {
+        if (id == null && resourceId == null && StringUtils.isBlank(resourceType)) {
             logger.debug("findJob called with all null parameters");
             return null;
         }

server/src/main/java/com/cloud/api/query/ResourceIdSupport.java

@@ -54,7 +54,7 @@ public interface ResourceIdSupport {
     default Long getResourceId(ApiCommandResourceType resourceType, String resourceUuid) {
         String uuid = getResourceUuid(resourceUuid);
 
-        if (resourceType == null || uuid == null) {
+        if (resourceType == null && uuid == null) {
             return null;
         } else if ((resourceType == null) ^ (uuid == null)) {
             throw new InvalidParameterValueException(String.format("Both %s and %s required",