if (!result.first && !criteria.validOnly && range.first!=range.second)
result.first = range.first->second;
- if (result.first && criteria.role && criteria.protocol) {
+ if (result.first && criteria.role) {
result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol);
if (!result.second && criteria.protocol2)
result.second = result.first->getRoleDescriptor(*criteria.role, criteria.protocol2);
pair<const EntityDescriptor*,const RoleDescriptor*> ChainingMetadataProvider::getEntityDescriptor(const Criteria& criteria) const
{
- bool bRole = (criteria.role && criteria.protocol); // searching for role also?
-
// Clear any existing lock.
const_cast<ChainingMetadataProvider*>(this)->unlock();
(*i)->lock();
cur = (*i)->getEntityDescriptor(criteria);
if (cur.first) {
- if (bRole) {
+ if (criteria.role) {
// We want a role also. Did we find one?
if (cur.second) {
// Are we using a first match policy?