archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-19 18:44:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8076383: Better CORBA exception handling

Browse source 
Reviewed-by: rriggs, coffeys, skoivu, ahgross
This commit is contained in:
Mark Sheppard 2015-06-25 13:48:49 +01:00
parent aa8e6904dc
commit a3837043b0
1 changed files with 32 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

33
corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop/StubGenerator.java
View file

@ -446,6 +446,9 @@ public class StubGenerator extends sun.rmi.rmic.iiop.Generator {
if (emitPermissionCheck) { if (emitPermissionCheck) {
// produce the following generated code for example // produce the following generated code for example
//
// private transient boolean _instantiated = false;
//
// private static Void checkPermission() { // private static Void checkPermission() {
// SecurityManager sm = System.getSecurityManager(); // SecurityManager sm = System.getSecurityManager();
// if (sm != null) { // if (sm != null) {
@ -460,11 +463,21 @@ public class StubGenerator extends sun.rmi.rmic.iiop.Generator {
// //
// public _XXXXX_Stub() { // public _XXXXX_Stub() {
// this(checkPermission()); // this(checkPermission());
// _instantiated = true;
// }
//
// private void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException {
// checkPermission();
// s.defaultReadObject();
// _instantiated = true;
// } // }
// //
// where XXXXX is the name of the remote interface // where XXXXX is the name of the remote interface
p.pln(); p.pln();
p.plnI("private transient boolean _instantiated = false;");
p.pln();
p.pO();
p.plnI("private static Void checkPermission() {"); p.plnI("private static Void checkPermission() {");
p.plnI("SecurityManager sm = System.getSecurityManager();"); p.plnI("SecurityManager sm = System.getSecurityManager();");
p.pln("if (sm != null) {"); p.pln("if (sm != null) {");
@ -481,13 +494,23 @@ public class StubGenerator extends sun.rmi.rmic.iiop.Generator {
p.pO(); p.pO();
p.pI(); p.pI();
p.pln("private " + currentClass + "(Void ignore) { }"); p.plnI("private " + currentClass + "(Void ignore) { }");
p.pln(); p.pln();
p.pO();
p.plnI("public " + currentClass + "() { "); p.plnI("public " + currentClass + "() { ");
p.pln("this(checkPermission());"); p.pln("this(checkPermission());");
p.pln("_instantiated = true;");
p.pOln("}"); p.pOln("}");
p.pln(); p.pln();
p.plnI("private void readObject(java.io.ObjectInputStream s) throws IOException, ClassNotFoundException {");
p.plnI("checkPermission();");
p.pO();
p.pln("s.defaultReadObject();");
p.pln("_instantiated = true;");
p.pOln("}");
p.pln();
//p.pO();
} }
if (!emitPermissionCheck) { if (!emitPermissionCheck) {
@ -894,6 +917,7 @@ public class StubGenerator extends sun.rmi.rmic.iiop.Generator {
String paramNames[] = method.getArgumentNames(); String paramNames[] = method.getArgumentNames();
Type returnType = method.getReturnType(); Type returnType = method.getReturnType();
ValueType[] exceptions = getStubExceptions(method,false); ValueType[] exceptions = getStubExceptions(method,false);
boolean hasIOException = false;
addNamesInUse(method); addNamesInUse(method);
addNameInUse("_type_ids"); addNameInUse("_type_ids");
@ -921,6 +945,13 @@ public class StubGenerator extends sun.rmi.rmic.iiop.Generator {
p.plnI(" {"); p.plnI(" {");
// Now create the method body... // Now create the method body...
if (emitPermissionCheck) {
p.pln("if ((System.getSecurityManager() != null) && (!_instantiated)) {");
p.plnI(" throw new java.io.IOError(new java.io.IOException(\"InvalidObject \"));");
p.pOln("}");
p.pln();
}
if (localStubs) { if (localStubs) {
writeLocalStubMethodBody(p,method,theType); writeLocalStubMethodBody(p,method,theType);