From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Mon, 17 Dec 2007 14:32:25 +0000 (+0000)
Subject: singular match case: no "other" attributes retrieved => no match
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=25932543bd16c2d9c8852663932bbe25d02dd9ef;p=jra1mw.git

singular match case: no "other" attributes retrieved => no match
---

diff --git a/org.glite.jp.primary/src/feed.c b/org.glite.jp.primary/src/feed.c
index be9ab1f..aebebdd 100644
--- a/org.glite.jp.primary/src/feed.c
+++ b/org.glite.jp.primary/src/feed.c
@@ -561,12 +561,13 @@ static int feed_query_callback(
 	}
 
 /* filter on non-meta query items */
-	if (other)
-		for (i=0; i<f->nother_qry; i++) {
-			for (j=0; other[j].name; j++) 
-				if (check_qry_item(ctx,f->other_qry+i,other+j)) break;
-			if (!other[j].name) goto cleanup; /* no match is not an error */
-		}
+	if (f->nother_qry && !other) goto cleanup;	/* unknown values can't match */
+
+	for (i=0; i<f->nother_qry; i++) {
+		for (j=0; other[j].name; j++) 
+			if (check_qry_item(ctx,f->other_qry+i,other+j)) break;
+		if (!other[j].name) goto cleanup; /* no match is not an error */
+	}
 
 /* extract attributes to be fed, stack the job for a batch feed */
 	for (i=0; meta && meta[i].name; i++)