Hi Dionis,

1st thing, the solution I've provided works for both, "prop" can be single entity or can be List of Entities. My solution works with both.
2nd point, If you want to make INNER JOIN, then I would like to know, why do you want to use

criteria.setFetchMode("prop", FetchMode.JOIN)

?
Because as I've mentioned, it will make a left outer join. If you want to have INNER JOIN on "prop", why do you want to use setFetchMode?