Author: richard.opalka(a)jboss.com Date: 2008-09-30 05:37:27 -0400 (Tue, 30 Sep 2008) New Revision: 8298 Removed: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java Log: [JBWS-2322] refactoring + ensure cleanup Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.java 2008-09-30 09:17:46 UTC (rev 8297) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.java 2008-09-30 09:37:27 UTC (rev 8298) @@ -47,14 +47,22 @@ { AttachmentPart part = (AttachmentPart) iter.next(); - InputStream inputStream = part.getDataHandler().getInputStream(); - int read = 0; - do + InputStream inputStream = null; + try { - count += read; - read = inputStream.read(buffer); + inputStream = part.getDataHandler().getInputStream(); + int read = 0; + do + { + count += read; + read = inputStream.read(buffer); + } + while (read != -1); } - while (read != -1); + finally + { + if (inputStream != null) inputStream.close(); + } } } catch (Exception e) Deleted: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2008-09-30 09:17:46 UTC (rev 8297) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/XOPTestSupport.java 2008-09-30 09:37:27 UTC (rev 8298) @@ -1,104 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxrpc.xop; - -import java.awt.Image; -import java.awt.Toolkit; -import java.io.ByteArrayInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.MalformedURLException; -import java.net.URL; - -import javax.activation.DataHandler; -import javax.xml.transform.stream.StreamSource; - -/** - * @author Heiko Braun <heiko.braun(a)jboss.com&gt; - * @since 22-Sep-2006 - */ -public class XOPTestSupport -{ - - public static byte[] getBytesFromFile(File file) throws IOException - { - InputStream is = new FileInputStream(file); - - long length = file.length(); - byte[] bytes = new byte[(int)length]; - - int offset = 0; - int numRead = 0; - while (offset < bytes.length && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0) - { - offset += numRead; - } - - is.close(); - return bytes; - } - - public static Image createTestImage(File imgFile) - { - Image image = null; - try - { - URL url = imgFile.toURL(); - - image = null; - try - { - image = Toolkit.getDefaultToolkit().createImage(url); - } - catch (Throwable th) - { - //log.warn("Cannot create Image: " + th); - } - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - - return image; - } - - public static StreamSource createTestSource() - { - return new StreamSource(new ByteArrayInputStream("<some><nestedXml/></some>".getBytes())); - } - - public static DataHandler createDataHandler(File imgFile) - { - try - { - URL url = imgFile.toURL(); - return new DataHandler(url); - } - catch (MalformedURLException e) - { - throw new RuntimeException(e); - } - } -} Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2008-09-30 09:17:46 UTC (rev 8297) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/doclit/XOPBase.java 2008-09-30 09:37:27 UTC (rev 8298) @@ -28,7 +28,7 @@ import javax.xml.rpc.Stub; import javax.xml.transform.Source; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; +import org.jboss.wsf.test.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2008-09-30 09:17:46 UTC (rev 8297) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxrpc/xop/rpclit/XOPBase.java 2008-09-30 09:37:27 UTC (rev 8298) @@ -29,7 +29,7 @@ import javax.xml.rpc.Stub; import javax.xml.transform.Source; -import org.jboss.test.ws.jaxrpc.xop.XOPTestSupport; +import org.jboss.wsf.test.XOPTestSupport; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandler; import org.jboss.test.ws.jaxrpc.xop.shared.PingDataHandlerResponse; import org.jboss.test.ws.jaxrpc.xop.shared.PingImage; Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java 2008-09-30 09:17:46 UTC (rev 8297) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/news/Printer.java 2008-09-30 09:37:27 UTC (rev 8298) @@ -22,6 +22,7 @@ package org.jboss.test.ws.jaxws.samples.news; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.GregorianCalendar; @@ -89,7 +90,12 @@ EditionSWA edition = swaEndpoint.getNewspaperEdition(id); DataHandler dh = edition.getContent(); System.out.println("Content type: " + dh.getContentType()); - System.out.println("Content: " + dh.getContent()); + Object dataContent = dh.getContent(); + System.out.println("Content: " + dataContent); + if (dataContent instanceof InputStream) + { + ((InputStream)dataContent).close(); + } } } }