Author: dazarov Date: 2007-07-20 08:16:42 -0400 (Fri, 20 Jul 2007) New Revision: 2537 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java Log: http://jira.jboss.com/jira/browse/EXIN-365 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-20 12:15:18 UTC (rev 2536) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2007-07-20 12:16:42 UTC (rev 2537) @@ -220,7 +220,7 @@ if (persistentClass.getIdentifier() instanceof Component) { Component identifier = (Component)persistentClass.getIdentifier(); - if (!identifier.getComponentClassName().equals(identifier.getOwner().getEntityName())) { + if (identifier.getComponentClassName() != null && !identifier.getComponentClassName().equals(identifier.getOwner().getEntityName())) { OrmShape componentClassShape = elements.get(identifier.getComponentClassName()); if (componentClassShape == null && persistentClass instanceof RootClass) { componentClassShape = getOrCreateComponentClass(((RootClass)persistentClass).getIdentifierProperty());