Merge

Thu, 12 Feb 2015 08:27:26 -0800

author
asaha
date
Thu, 12 Feb 2015 08:27:26 -0800
changeset 855
afb9e59889ad
parent 854
fc20d5bd2512
parent 812
f3d678fe58e7
child 856
35653a65a39d

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Jan 28 21:51:08 2015 -0800
     1.2 +++ b/.hgtags	Thu Feb 12 08:27:26 2015 -0800
     1.3 @@ -376,10 +376,14 @@
     1.4  16485a38b6bc762b363f4e439047486742fbcfcb jdk8u40-b21
     1.5  6e928fd9152541eddf25694be89eb881434a5c5f jdk8u40-b22
     1.6  b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
     1.7 +5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
     1.8 +b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
     1.9  667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
    1.10  cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
    1.11  855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02
    1.12  698a88182586b0914b204de27cc45d6f0dfe7683 jdk8u45-b03
    1.13  c7307f75843b64e6096205425ba2f7387017ee9e jdk8u45-b04
    1.14  6bd873f17e03cf285f576f69340123e3b2d8922f jdk8u45-b05
    1.15 +a5e99f4d067ebea01e438e5b3e9b09bda47ddb25 jdk8u45-b06
    1.16 +145ea6d2899f5cc6bd4e1108903e4d22ad063eca jdk8u45-b07
    1.17  74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00
     2.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Wed Jan 28 21:51:08 2015 -0800
     2.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Thu Feb 12 08:27:26 2015 -0800
     2.3 @@ -135,7 +135,7 @@
     2.4  
     2.5      private void filterClass(List<Reference> classes, Collection<? extends Element> elements) {
     2.6          for (Element element : elements) {
     2.7 -            if (element.getKind().equals(ElementKind.CLASS)) {
     2.8 +            if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.ENUM)) {
     2.9                  classes.add(new Reference((TypeElement) element, processingEnv));
    2.10                  filterClass(classes, ElementFilter.typesIn(element.getEnclosedElements()));
    2.11              }

mercurial