summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2012-11-16 16:53:48 (EST)
committerKaren Butzke2012-11-16 16:53:48 (EST)
commitcd9b5ac8c5cc54381482501e4c09af1a087a50fc (patch)
treeec8abe83ee06ce9a26d960ac33bf53b77f2a3625
parent135e257ef8ac1d6f66e79cc2a418ef30e46e8ced (diff)
downloadwebtools.dali-cd9b5ac8c5cc54381482501e4c09af1a087a50fc.zip
webtools.dali-cd9b5ac8c5cc54381482501e4c09af1a087a50fc.tar.gz
webtools.dali-cd9b5ac8c5cc54381482501e4c09af1a087a50fc.tar.bz2
Bug 394418 - NPEs in log of EclipseLink JAXB tests, locally and in build
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java
index bdb0386..da2b345 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/context/oxm/OxmXmlBindingsImpl.java
@@ -199,7 +199,8 @@ public class OxmXmlBindingsImpl
protected String buildImpliedPackageName() {
for (OxmJavaType javaType : getJavaTypes()) {
- String packageName = TypeDeclarationTools.packageName(javaType.getSpecifiedName());
+ String specifiedName = javaType.getSpecifiedName();
+ String packageName = specifiedName == null ? null : TypeDeclarationTools.packageName(specifiedName);
if (! StringTools.isBlank(packageName)) {
return packageName;
}