# HG changeset patch
# User asaha
# Date 1430857134 25200
# Node ID 0ec6a9f6907bbe23a2f1d8ea0fb259d948c0fa5b
# Parent  bfa3885b2be819e60c820d8166ee0907eb85bf41# Parent  1a855f69de645c4bd485d5fb6d9a524994278a16
Merge

diff -r bfa3885b2be8 -r 0ec6a9f6907b .hgtags
--- a/.hgtags	Mon Apr 27 15:02:49 2015 -0700
+++ b/.hgtags	Tue May 05 13:18:54 2015 -0700
@@ -398,6 +398,7 @@
 3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12
 15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13
 bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14
+cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15
 8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31
 1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32
 74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00
@@ -411,6 +412,7 @@
 cbba234a2b481b236e2bf78c892111b86f6bba81 jdk8u51-b08
 9116c6bb2ffa6bb624ad39f7a98b7b9bed4512dc jdk8u51-b09
 783b917616ab6977f9b3157667d1493636ba66d1 jdk8u51-b10
+5a69995912aae8bd61758e95a3b5edac167b6acc jdk8u51-b11
 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06
 45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07
 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00
diff -r bfa3885b2be8 -r 0ec6a9f6907b src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java	Mon Apr 27 15:02:49 2015 -0700
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java	Tue May 05 13:18:54 2015 -0700
@@ -30,7 +30,12 @@
 import com.sun.source.util.Trees;
 import com.sun.xml.internal.bind.v2.model.nav.Navigator;
 import com.sun.xml.internal.bind.v2.runtime.Location;
-
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -52,12 +57,6 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.Types;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 
 /**
  * {@link Navigator} implementation for annotation processing.
@@ -241,7 +240,7 @@
 
     public VariableElement[] getEnumConstants(TypeElement clazz) {
         List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz);
-        Collection<VariableElement> constants = new HashSet<VariableElement>();
+        Collection<VariableElement> constants = new ArrayList<VariableElement>();
         for (Element element : elements) {
             if (element.getKind().equals(ElementKind.ENUM_CONSTANT)) {
                 constants.add((VariableElement) element);