Merge

Author: gnu-andrew

corba/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java

@@ -317,6 +317,8 @@ public static int makePersistent( int scid )
     public static final String DYNAMIC_STUB_FACTORY_FACTORY_CLASS =
         SUN_PREFIX + "ORBDynamicStubFactoryFactoryClass" ;
 
+    public static final String ALLOW_DESERIALIZE_OBJECT = SUN_PREFIX + "ORBAllowDeserializeObject" ;
+
     // Constants for NameService properties ************************************
 
     public static final int DEFAULT_INITIAL_PORT                 = 900;

corba/src/share/classes/com/sun/tools/corba/se/idl/toJavaPortable/Stub.java

@@ -342,6 +342,11 @@ protected void writeSerializationMethods ()
     stream.println ("  private void readObject (java.io.ObjectInputStream s) throws java.io.IOException");
     stream.println ("  {");
     stream.println ("     String str = s.readUTF ();");
+    if ("DynAnyFactory".equals (i.name ())) {
+      stream.println ("     if (!str.startsWith(com.sun.corba.se.impl.orbutil.ORBConstants.STRINGIFY_PREFIX) &&");
+      stream.println ("         !Boolean.getBoolean(com.sun.corba.se.impl.orbutil.ORBConstants.ALLOW_DESERIALIZE_OBJECT))");
+      stream.println ("       throw new java.io.InvalidObjectException(\"IOR: expected\");");
+    }
     stream.println ("     String[] args = null;");
     stream.println ("     java.util.Properties props = null;");
     stream.println ("     org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init (args, props);");