Index: FindTModelByCategoryQuery.java
===================================================================
RCS file: /home/cvs/ws-juddi/src/java/org/apache/juddi/datastore/jdbc/FindTModelByCategoryQuery.java,v
retrieving revision 1.1
diff -r1.1 FindTModelByCategoryQuery.java
66a67
> import org.apache.juddi.datatype.tmodel.TModel;
173c174,175
<             if ((name != null) && (value != null))
---
>           String tModelKey = keyedRef.getTModelKey();
>             if (tModelKey.equals(TModel.GENERAL_KEYWORDS_TMODEL_KEY)) 
175,178c177,193
<               sql.append("(C.KEY_NAME = '").append(name).append("' AND C.KEY_VALUE = '").append(value).append("')");
< 
<               if (i+1 < vectorSize)
<                 sql.append(" OR ");
---
>               // DO NOT ignore the name .. 
>               if ((name != null) && (value != null))
>               {
>                 sql.append("(C.KEY_NAME = '").append(name).append("' AND C.KEY_VALUE = '").append(value).append("')");
> 
>                 if (i+1 < vectorSize)
>                   sql.append(" OR ");
>               }
>             }
>             else {
>               if (value != null)
>               {
>                 sql.append("(C.KEY_VALUE = '").append(value).append("')");
> 
>                 if (i+1 < vectorSize)
>                   sql.append(" OR ");
>               }