# HG changeset patch
# User asaha
# Date 1423758446 28800
# Node ID afb9e59889ad0b13294c2a1e7d5c774c40927cb8
# Parent  fc20d5bd2512ee1992a3b2edfa17e0ffa87f6b5a# Parent  f3d678fe58e7c026fb62be8b72c46ce1015aadf6
Merge

diff -r fc20d5bd2512 -r afb9e59889ad .hgtags
--- a/.hgtags	Wed Jan 28 21:51:08 2015 -0800
+++ b/.hgtags	Thu Feb 12 08:27:26 2015 -0800
@@ -376,10 +376,14 @@
 16485a38b6bc762b363f4e439047486742fbcfcb jdk8u40-b21
 6e928fd9152541eddf25694be89eb881434a5c5f jdk8u40-b22
 b6755a463ccf6a79b1e1a43ed7bdb1c5cb1ac17d jdk8u40-b23
+5fbbfd66643edb81cfa0688825d698dcc5f2eb11 jdk8u40-b24
+b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25
 667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
 cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
 855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02
 698a88182586b0914b204de27cc45d6f0dfe7683 jdk8u45-b03
 c7307f75843b64e6096205425ba2f7387017ee9e jdk8u45-b04
 6bd873f17e03cf285f576f69340123e3b2d8922f jdk8u45-b05
+a5e99f4d067ebea01e438e5b3e9b09bda47ddb25 jdk8u45-b06
+145ea6d2899f5cc6bd4e1108903e4d22ad063eca jdk8u45-b07
 74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00
diff -r fc20d5bd2512 -r afb9e59889ad src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Wed Jan 28 21:51:08 2015 -0800
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java	Thu Feb 12 08:27:26 2015 -0800
@@ -135,7 +135,7 @@
 
     private void filterClass(List<Reference> classes, Collection<? extends Element> elements) {
         for (Element element : elements) {
-            if (element.getKind().equals(ElementKind.CLASS)) {
+            if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.ENUM)) {
                 classes.add(new Reference((TypeElement) element, processingEnv));
                 filterClass(classes, ElementFilter.typesIn(element.getEnclosedElements()));
             }