Author: thomas.diesler(a)jboss.com Date: 2006-11-05 13:56:14 -0500 (Sun, 05 Nov 2006) New Revision: 1391 Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java Log: Add marshalling of null values in base64Binary and hexBinary Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-05 15:43:59 UTC (rev 1390) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/MarshallTest.java 2006-11-05 18:56:14 UTC (rev 1391) @@ -206,15 +206,21 @@ public void testBase64Binary() throws Exception { byte[] in = "base64Binary".getBytes(); - byte[] out = base64BinaryTest(in); - assertEquals(new String(in), new String(out)); + Object out = base64BinaryTest(in); + assertEquals(new String(in), new String((byte[])out)); + + out = base64BinaryTest(null); + assertNull(out); } public void testHexBinary() throws Exception { byte[] in = "hexBinary".getBytes(); byte[] out = hexBinaryTest(in); - assertEquals(new String(in), new String(out)); + assertEquals(new String(in), new String((byte[])out)); + + out = hexBinaryTest(null); + assertNull(out); } public void testCalendar() throws Exception Modified: branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java =================================================================== --- branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java 2006-11-05 15:43:59 UTC (rev 1390) +++ branches/jbossws-1.0/src/test/java/org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.java 2006-11-05 18:56:14 UTC (rev 1391) @@ -166,13 +166,13 @@ public byte[] base64BinaryTest(byte[] param) { - log.info("base64BinaryTest: " + new String(param)); + log.info("base64BinaryTest: " + (param != null ? new String(param) : null)); return param; } public byte[] hexBinaryTest(byte[] param) { - log.info("hexBinaryTest: " + new String(param)); + log.info("hexBinaryTest: " + (param != null ? new String(param) : null)); return param; }