fix merge issue

shwstppr · shwstppr · commit a46873df8166 · 2025-06-19T17:31:21.000+05:30
Signed-off-by: Abhishek Kumar &lt;abhishek.mrt22@gmail.com&gt;
diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -5292,7 +5292,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForIsosInternal(ListIsosCmd cm
                 cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), cmd.getStoragePoolId(), cmd.getImageStoreId(),
                 hypervisorType, true, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria,
                 tags, showRemovedISO, null, null, cmd.getShowUnique(), null, null,
-                cmd.getArch(), cmd.getOsCategoryId(), null);
+                cmd.getArch(), cmd.getOsCategoryId(), null, null);
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -5292,7 +5292,7 @@ private Pair<List<TemplateJoinVO>, Integer> searchForIsosInternal(ListIsosCmd cm`
`5292`	`5292`	`cmd.getPageSizeVal(), cmd.getStartIndex(), cmd.getZoneId(), cmd.getStoragePoolId(), cmd.getImageStoreId(),`
`5293`	`5293`	`hypervisorType, true, cmd.listInReadyState(), permittedAccounts, caller, listProjectResourcesCriteria,`
`5294`	`5294`	`tags, showRemovedISO, null, null, cmd.getShowUnique(), null, null,`
`5295`		`- cmd.getArch(), cmd.getOsCategoryId(), null);`
	`5295`	`+ cmd.getArch(), cmd.getOsCategoryId(), null, null);`
`5296`	`5296`	`}`
`5297`	`5297`
`5298`	`5298`	`@Override`