Mercurial > hg > openjdk > bsd-port > jdk
changeset 7789:57ac2bbc3075
5036554: unmarshal error on CORBA alias type in CORBA any
Reviewed-by: chegar, smarks
author | coffeys |
---|---|
date | Wed, 23 Oct 2013 16:53:42 +0100 |
parents | d6fb53a01abc |
children | 47834fe119cb |
files | test/com/sun/corba/5036554/JavaBug.java test/com/sun/corba/5036554/README test/com/sun/corba/5036554/TestCorbaBug.sh test/com/sun/corba/5036554/bug.idl |
diffstat | 4 files changed, 230 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/corba/5036554/JavaBug.java Wed Oct 23 16:53:42 2013 +0100 @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2013, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code 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 General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +package bug; + +public class JavaBug { + public static void main(String[] args) { + try { + org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args, null); + org.omg.CORBA.Any any = orb.create_any(); + myStringHelper.insert(any, "hello"); + System.out.println("Any: " + myStringHelper.extract(any)); + } catch( Exception e ) { + e.printStackTrace(); + } + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/corba/5036554/README Wed Oct 23 16:53:42 2013 +0100 @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2013, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code 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 General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +Bug # 5036554 unmarshal error on CORBA alias type in CORBA any + +Platform : ALL + +Testcase directory : <.../corba> + +Test Procedure : <STEPS TO FOLLOW TO REPRODUCE THE PROBLEM : +Step 1: create a file bug.idl with the following content: + +// IDL file bug.idl +module bug { + typedef string myString; +}; + +Step 2: Translate bug.idl with the command: idlj bug.idl +This will create the file bug/myStringHelper.java + +Step 3: +Create the file JavaBug.java in directory bug with the following content: + +// Java file JavaBug.java +package bug; + +public class JavaBug { + public static void main(String[] args) { + try { + org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init(args, null); + org.omg.CORBA.Any any = orb.create_any(); + myStringHelper.insert(any, "hello"); + System.out.println("Any: " + myStringHelper.extract(any)); + } catch( Exception e ) { + e.printStackTrace(); + } + } +} + +Step 4: +Compile all java files with the command: javac -d . bug\*.java + +Step 5: +Execute the program with the command: java -cp . bug/JavaBug + +Step 6: Note the null pointer exception in the the output! + + +Without Fix behaviour : <java.lang.NullPointerException + at com.sun.corba.se.internal.corba.TCUtility.unmarshalIn(TCUtility.java:290) + at com.sun.corba.se.internal.corba.AnyImpl.read_value(AnyImpl.java:561) + at bug.myStringHelper.insert(myStringHelper.java:20) + at bug.JavaBug.main(JavaBug.java:8)> + +With Fix behaviour : <The output message printed on the console: "Any: hello"> + +Other Comments : <Test case is automated.>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/com/sun/corba/5036554/TestCorbaBug.sh Wed Oct 23 16:53:42 2013 +0100 @@ -0,0 +1,112 @@ +#!/bin/sh +# +# Copyright (c) 2013, 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 +# under the terms of the GNU General Public License version 2 only, as +# published by the Free Software Foundation. +# +# This code 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 General Public License +# version 2 for more details (a copy is included in the LICENSE file that +# accompanied this code). +# +# You should have received a copy of the GNU General Public License version +# 2 along with this work; if not, write to the Free Software Foundation, +# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. +# +# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA +# or visit www.oracle.com if you need additional information or have any +# questions. +# + +# @test +# @bug 5036554 6357706 +# @summary unmarshal error on CORBA alias type in CORBA any +# @run shell TestCorbaBug.sh + +if [ "${TESTSRC}" = "" ] +then TESTSRC=. +fi + +if [ "${TESTJAVA}" = "" ] +then + PARENT=`dirname \`which java\`` + TESTJAVA=`dirname ${PARENT}` + echo "TESTJAVA not set, selecting " ${TESTJAVA} + echo "If this is incorrect, try setting the variable manually." +fi + +if [ "${TESTCLASSES}" = "" ] +then + echo "TESTCLASSES not set. Test cannot execute. Failed." + exit 1 +fi + +# set platform-dependent variables +OS=`uname -s` +case "$OS" in + SunOS | Linux | Darwin ) + PS=":" + FS="/" + ;; + CYGWIN* ) + PS=";" + FS="/" + ;; + Windows* ) + PS=";" + FS="\\" + ;; + * ) + echo "Unrecognized system!" + exit 1; + ;; +esac + +CLASSPATH=.${PS}${TESTCLASSES}; export CLASSPATH + +THIS_DIR=`pwd` + +${TESTJAVA}${FS}bin${FS}java -version + +mkdir bug + +cp ${TESTSRC}${FS}bug.idl . +${TESTJAVA}${FS}bin${FS}idlj bug.idl + +cp ${TESTSRC}${FS}JavaBug.java bug + +chmod -fR 777 bug + +${TESTJAVA}${FS}bin${FS}javac -d . bug${FS}*.java + +${TESTJAVA}${FS}bin${FS}java -cp . bug/JavaBug > test.out 2>&1 + +grep "NullPointerException" test.out + +ERROR=$? + +cat test.out + +if [ $ERROR = 0 ] +then + echo "Test Failed" + exit 1 +fi + +grep "Any: hello" test.out + +STATUS=$? + +if [ $STATUS = 0 ] +then + echo "Test Passed" + exit 0 +else + echo "Invalid output" + cat test.out + exit 2 +fi