| commit | e1aae587620cc1ef2945691dfa2cf0da5dba4237 | [log] [tgz] |
|---|---|---|
| author | johnbracken <john.b.bracken@oracle.com> | Mon Dec 17 11:15:01 2012 -0800 |
| committer | johnbracken <john.b.bracken@oracle.com> | Mon Dec 17 11:15:01 2012 -0800 |
| tree | 49acb7033f8d0a71a3f16781801b048f0ac20289 | |
| parent | 864f72369f3509527d08372a67a5358330c7671a [diff] | |
| parent | 1516158c36554507f7d7ebeb0c80eebdbf05aba9 [diff] |
Merge branch 'master' of ssh://git.eclipse.org/gitroot/eclipselink/eclipselink.utils.temp
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java index 5a54028..8ce5870 100644 --- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java +++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/EmbeddableEntity.java
@@ -324,7 +324,7 @@ */ @Override protected final Element addSelf(String elementName) { - return addChild(getParent(), elementName, index); + return addChild(getParent(), elementName, index, getParent().getElementNamesOrder()); } /**
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java index 9db77d7..a70fd27 100644 --- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java +++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/ORMConfiguration.java
@@ -162,6 +162,9 @@ */ @Override public ExternalEntity addEntity(String entityClassName) { + if (entityClassName == null) { + System.err.println(); + } Entity entity = buildEntity(entitiesSize()); entity.addSelf(); entity.setClassName(entityClassName);