Skip to content

[#1058] fix NPE on DummyListField get field uninitialized #1862

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[#1058] fix NPE on DummyListField get field uninitialized #1862

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/generator/bean/field/DummyListField.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
import com.sun.codemodel.JVar;
import com.sun.tools.xjc.generator.bean.ClassOutlineImpl;
import com.sun.tools.xjc.generator.bean.MethodWriter;
import com.sun.tools.xjc.model.CPropertyInfo;
import com.sun.tools.xjc.model.CReferencePropertyInfo;
import com.sun.tools.xjc.outline.FieldAccessor;
Expand Down Expand Up @@ -110,7 +112,24 @@ protected final JClass getCoreListType() {
}

@Override
public void generateAccessors() { }
public void generateAccessors() {
final MethodWriter writer = outline.createMethodWriter();
final AbstractListField.Accessor acc = (AbstractListField.Accessor) create(JExpr._this());

// [RESULT]
// List getXXX() {
// return <ref>;
// }
$get = writer.declareMethod(listT,"get"+prop.getName(true));
if (prop.javadoc != null && !prop.javadoc.isEmpty()) {
writer.javadoc().appendXML(prop.javadoc).append("\n\n");
}
JBlock block = $get.body();
fixNullRef(block); // avoid using an internal getter
block._return(acc.ref(true));

appendJavadoc(writer);
}

@Override
public FieldAccessor create(JExpression targetObject) {
Expand Down