antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

additional checks in getNameOrID()

Browse source
This commit is contained in:
hns 2001-01-11 19:25:38 +00:00
parent 28df583817
commit fb47ffa0ac
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/helma/objectmodel/db/Node.java
View file

@ -142,6 +142,8 @@ public class Node implements INode, Serializable {
checkWriteLock (); checkWriteLock ();
String nameField = dbmap.getNameField (); String nameField = dbmap.getNameField ();
name = nameField == null ? id : rec.getValue (nameField).asString (); name = nameField == null ? id : rec.getValue (nameField).asString ();
if (name == null || name.length() == 0)
name = id;
setPrototype (dbmap.getTypeName ()); setPrototype (dbmap.getTypeName ());
for (Enumeration e=dbmap.db2prop.elements (); e.hasMoreElements(); ) { for (Enumeration e=dbmap.db2prop.elements (); e.hasMoreElements(); ) {
@ -418,7 +420,7 @@ public class Node implements INode, Serializable {
} }
} catch (Exception ignore) {} // just fall back to ID } catch (Exception ignore) {} // just fall back to ID
} }
return anonymous ? id : name; return anonymous || name == null || name.length() == 0 ? id : name;
} }