8174735: Update JAX-WS RI integration to latest version
Reviewed-by: alanb, mchung, lancea
diff --git a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
index b66cbbd..8f063f1 100644
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging/saaj/soap/ImageDataContentHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -67,8 +67,9 @@
*
* @return The DataFlavors.
*/
+ @Override
public DataFlavor[] getTransferDataFlavors() {
- return (DataFlavor[]) Arrays.copyOf(flavor, flavor.length);
+ return Arrays.copyOf(flavor, flavor.length);
}
/**
@@ -80,6 +81,7 @@
* @param ds The DataSource representing the data to be converted.
* @return The constructed Object.
*/
+ @Override
public Object getTransferData(DataFlavor df, DataSource ds)
throws IOException {
for (int i=0; i < flavor.length; i++) {
@@ -98,6 +100,7 @@
* @param ds The DataSource representing the data to be converted.
* @return The constructed Object.
*/
+ @Override
public Object getContent(DataSource ds) throws IOException {
return ImageIO.read(new BufferedInputStream(ds.getInputStream()));
}
@@ -107,11 +110,11 @@
* and write it to the output stream.
*
* @param obj The object to be converted.
- * @param mimeType The requested MIME type of the resulting byte stream.
+ * @param type The requested MIME type of the resulting byte stream.
* @param os The output stream into which to write the converted
* byte stream.
*/
-
+ @Override
public void writeTo(Object obj, String type, OutputStream os)
throws IOException {