Index: src/IceGrid/DescriptorHelper.cpp
===================================================================
RCS file: /home/cvsroot/ice/src/IceGrid/DescriptorHelper.cpp,v
retrieving revision 1.68
diff -r1.68 DescriptorHelper.cpp
650,651c650,654
< 	    obj.id.name = resolve(q->id.name, "object identity name", false);
< 	    obj.id.category = resolve(q->id.category, "object identity category");
---
> 	    obj.id = Ice::stringToIdentity(resolve(Ice::identityToString(q->id), "object identity", false));
> 	    if(obj.id.name.empty())
> 	    {
> 		resolve.exception("invalid object identity `" + Ice::identityToString(q->id) + "': name empty");
> 	    }
1992,1993c1995,1999
< 	    q->id.name = resolve(q->id.name, "object identity name", false);
< 	    q->id.category = resolve(q->id.category, "object identity category");
---
> 	    q->id = Ice::stringToIdentity(resolve(Ice::identityToString(q->id), "object identity", false));
> 	    if(q->id.name.empty())
> 	    {
> 		resolve.exception("invalid object identity `" + Ice::identityToString(q->id) + "': name empty");
> 	    }