Merge jdk8u60-b03

Wed, 11 Feb 2015 18:56:01 -0800

author
lana
date
Wed, 11 Feb 2015 18:56:01 -0800
changeset 767
3e52068e8b9d
parent 765
13d98e20e58d
parent 766
cd666534bc24
child 768
02b1d3c68132
child 771
6f4fc55fcd63

Merge

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Wed Feb 11 12:18:45 2015 -0800
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Wed Feb 11 18:56:01 2015 -0800
     1.3 @@ -135,7 +135,7 @@
     1.4  
     1.5      private void filterClass(List<Reference> classes, Collection<? extends Element> elements) {
     1.6          for (Element element : elements) {
     1.7 -            if (element.getKind().equals(ElementKind.CLASS)) {
     1.8 +            if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.ENUM)) {
     1.9                  classes.add(new Reference((TypeElement) element, processingEnv));
    1.10                  filterClass(classes, ElementFilter.typesIn(element.getEnclosedElements()));
    1.11              }

mercurial