Mercurial > hg > openjdk > jigsaw > corba
changeset 438:d9c1dab1515b
Merge
author | lana |
---|---|
date | Mon, 08 Oct 2012 15:38:19 -0700 |
parents | 207ef43ba69e (current diff) 27d87f0031bf (diff) |
children | 0e08ba7648fb |
files | |
diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java Thu Oct 04 14:34:34 2012 -0700 +++ b/src/share/classes/sun/rmi/rmic/iiop/StubGenerator.java Mon Oct 08 15:38:19 2012 -0700 @@ -1631,7 +1631,7 @@ // Write data members... p.pln(); - p.pln("private " + getName(theType) + " target = null;"); + p.pln("volatile private " + getName(theType) + " target = null;"); p.pln(); // Write the ids... @@ -1695,6 +1695,10 @@ if (remoteMethods.length > 0) { p.plnI("try {"); + p.pln(getName(theType) + " target = this.target;"); + p.plnI("if (target == null) {"); + p.pln("throw new java.io.IOException();"); + p.pOln("}"); p.plnI(idExtInputStream + " "+in+" = "); p.pln("(" + idExtInputStream + ") "+_in+";"); p.pO();