You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2018/10/09 22:27:43 UTC

svn commit: r1843357 - in /webservices/axiom/trunk: axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java

Author: veithen
Date: Tue Oct  9 22:27:43 2018
New Revision: 1843357

URL: http://svn.apache.org/viewvc?rev=1843357&view=rev
Log:
Fix build failures on Java 10.

Modified:
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java
    webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java?rev=1843357&r1=1843356&r2=1843357&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/NamespaceURICorrectingNamespaceContextWrapper.java Tue Oct  9 22:27:43 2018
@@ -49,7 +49,7 @@ class NamespaceURICorrectingNamespaceCon
     }
 
     @Override
-    public Iterator<?> getPrefixes(String namespaceURI) {
+    public Iterator<String> getPrefixes(String namespaceURI) {
         return parent.getPrefixes(namespaceURI);
     }
 }

Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java?rev=1843357&r1=1843356&r2=1843357&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/util/stax/xop/XOPEncodingStreamReader.java Tue Oct  9 22:27:43 2018
@@ -81,8 +81,8 @@ public class XOPEncodingStreamReader ext
         }
 
         @Override
-        public Iterator<?> getPrefixes(String namespaceURI) {
-            Iterator<?> prefixes = parent.getPrefixes(namespaceURI);
+        public Iterator<String> getPrefixes(String namespaceURI) {
+            Iterator<String> prefixes = parent.getPrefixes(namespaceURI);
             if (XOPConstants.NAMESPACE_URI.equals(namespaceURI)) {
                 if (!prefixes.hasNext()) {
                     return xopPrefixList.iterator();