From 1ebf9693afe440c377d38d65f7cb754e905da223 Mon Sep 17 00:00:00 2001 From: vavishal Date: Thu, 18 Oct 2018 02:53:49 -0700 Subject: [PATCH 1/2] Fix for bug 28773106 Signed-off-by: vavishal vaibhav.vishal@oracle.com --- .../com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java b/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java index a5b2d9be24..619a0f1a03 100644 --- a/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java +++ b/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java @@ -257,8 +257,7 @@ private void processXmlElement(List jaxb, String elemName, String el String ns = (elemAnn != null && !elemAnn.namespace().equals("##default")) ? elemAnn.namespace() : elemNS; - boolean nillable = nav.isArray(type) - || (elemAnn != null && elemAnn.nillable()); + boolean nillable = (elemAnn != null && elemAnn.nillable()); boolean required = elemAnn != null && elemAnn.required(); XmlElementHandler handler = new XmlElementHandler(name, ns, nillable, required); From fcc5b6c3c20be9fd1fe5048f1d0d60435fcd3ff1 Mon Sep 17 00:00:00 2001 From: vavishal Date: Thu, 18 Oct 2018 03:10:05 -0700 Subject: [PATCH 2/2] Updated the copyright year --- .../java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java b/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java index 619a0f1a03..92a821124f 100644 --- a/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java +++ b/jaxws-ri/rt/src/main/java/com/sun/xml/ws/model/AbstractWrapperBeanGenerator.java @@ -1,7 +1,7 @@ /* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * - * Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997-2018 Oracle and/or its affiliates. All rights reserved. * * The contents of this file are subject to the terms of either the GNU * General Public License Version 2 only ("GPL") or the Common Development