/hg/icedtea6-hg: Remove upstreamed CORBA patches from the 2013/0...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Aug 6 08:36:52 PDT 2013
changeset 7307b283e366 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7307b283e366
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Aug 06 16:34:58 2013 +0100
Remove upstreamed CORBA patches from the 2013/06/18 erratum.
2013-08-06 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/security/20130618/8000642-better_transportation_handling.patch,
* patches/security/20130618/8001032-restrict_object_access-corba.patch:
Removed.
* Makefile.am:
(ICEDTEA_PATCHES): Remove upstreamed patches.
diffstat:
ChangeLog | 8 +
Makefile.am | 2 -
patches/security/20130618/8000642-better_transportation_handling.patch | 808 ----------
patches/security/20130618/8001032-restrict_object_access-corba.patch | 544 ------
4 files changed, 8 insertions(+), 1354 deletions(-)
diffs (truncated from 1388 to 500 lines):
diff -r c56469bd12cb -r 7307b283e366 ChangeLog
--- a/ChangeLog Mon Aug 05 12:14:35 2013 +0100
+++ b/ChangeLog Tue Aug 06 16:34:58 2013 +0100
@@ -1,3 +1,11 @@
+2013-08-06 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/security/20130618/8000642-better_transportation_handling.patch,
+ * patches/security/20130618/8001032-restrict_object_access-corba.patch:
+ Removed.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove upstreamed patches.
+
2013-08-02 Andrew John Hughes <gnu.andrew at redhat.com>
* hotspot.map: Bring in hs23 changes to ARM32
diff -r c56469bd12cb -r 7307b283e366 Makefile.am
--- a/Makefile.am Mon Aug 05 12:14:35 2013 +0100
+++ b/Makefile.am Tue Aug 06 16:34:58 2013 +0100
@@ -282,9 +282,7 @@
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
- patches/security/20130618/8001032-restrict_object_access-corba.patch \
patches/security/20130618/handle_npe.patch \
- patches/security/20130618/8000642-better_transportation_handling.patch \
patches/openjdk/6786028-wcag_bold_tags.patch \
patches/openjdk/6786682-wcag_lang.patch \
patches/openjdk/6802694-no_deprecated.patch \
diff -r c56469bd12cb -r 7307b283e366 patches/security/20130618/8000642-better_transportation_handling.patch
--- a/patches/security/20130618/8000642-better_transportation_handling.patch Mon Aug 05 12:14:35 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,808 +0,0 @@
-# HG changeset patch
-# User Severin Gehwolf <sgehwolf at redhat.com>
-# Date 1371488468 -7200
-# Node ID bec83758f55670cdb7865e8103f8100dc6f4f0fb
-# Parent 1260b4e54a2373aac77afdcdeb3f7ac8e6319c9e
-8000642: Better handling of objects for transportation
-Summary: Also reviewed by alexander.fomin
-Reviewed-by: alanb, mchung, skoivu
-
-diff --git a/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java b/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/AnyImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 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
-@@ -33,6 +33,8 @@
-
- import java.io.Serializable;
- import java.math.BigDecimal;
-+import java.security.AccessController;
-+import java.security.PrivilegedAction;
- import java.util.List ;
- import java.util.ArrayList ;
-
-@@ -504,7 +506,12 @@
- public org.omg.CORBA.portable.OutputStream create_output_stream()
- {
- //debug.log ("create_output_stream");
-- return new AnyOutputStream(orb);
-+ final ORB finalorb = this.orb;
-+ return AccessController.doPrivileged(new PrivilegedAction<AnyOutputStream>() {
-+ public AnyOutputStream run() {
-+ return new AnyOutputStream(finalorb);
-+ }
-+ });
- }
-
- /**
-diff --git a/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java b/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/corba/TypeCodeImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1996, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1996, 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
-@@ -600,7 +600,8 @@
- }
-
- public static CDROutputStream newOutputStream(ORB orb) {
-- TypeCodeOutputStream tcos = new TypeCodeOutputStream((ORB)orb);
-+ TypeCodeOutputStream tcos =
-+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream(orb);
- //if (debug) System.out.println("Created TypeCodeOutputStream " + tcos +
- // " with no parent");
- return tcos;
-diff --git a/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java b/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/IDLJavaSerializationOutputStream.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2004, 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
-@@ -66,7 +66,7 @@
- *
- * @author Ram Jeyaraman
- */
--public class IDLJavaSerializationOutputStream extends CDROutputStreamBase {
-+final class IDLJavaSerializationOutputStream extends CDROutputStreamBase {
-
- private ORB orb;
- private byte encodingVersion;
-diff --git a/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java b/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/encoding/TypeCodeOutputStream.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2002, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2002, 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
-@@ -196,7 +196,8 @@
- }
-
- public TypeCodeOutputStream createEncapsulation(org.omg.CORBA.ORB _orb) {
-- TypeCodeOutputStream encap = new TypeCodeOutputStream((ORB)_orb, isLittleEndian());
-+ TypeCodeOutputStream encap =
-+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)_orb, isLittleEndian());
- encap.setEnclosingOutputStream(this);
- encap.makeEncapsulation();
- //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + encap + " with parent " + this);
-@@ -211,7 +212,8 @@
-
- public static TypeCodeOutputStream wrapOutputStream(OutputStream os) {
- boolean littleEndian = ((os instanceof CDROutputStream) ? ((CDROutputStream)os).isLittleEndian() : false);
-- TypeCodeOutputStream tos = new TypeCodeOutputStream((ORB)os.orb(), littleEndian);
-+ TypeCodeOutputStream tos =
-+ sun.corba.OutputStreamFactory.newTypeCodeOutputStream((ORB)os.orb(), littleEndian);
- tos.setEnclosingOutputStream(os);
- //if (TypeCodeImpl.debug) System.out.println("Created TypeCodeOutputStream " + tos + " with parent " + os);
- return tos;
-diff --git a/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java b/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/CDREncapsCodec.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -155,7 +155,8 @@
- // be versioned. This can be handled once this work is complete.
-
- // Create output stream with default endianness.
-- EncapsOutputStream cdrOut = new EncapsOutputStream(
-+ EncapsOutputStream cdrOut =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(
- (com.sun.corba.se.spi.orb.ORB)orb, giopVersion );
-
- // This is an encapsulation, so put out the endian:
-diff --git a/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java b/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/interceptors/RequestInfoImpl.java
-@@ -655,7 +655,8 @@
- // Convert the "core" service context to an
- // "IOP" ServiceContext by writing it to a
- // CDROutputStream and reading it back.
-- EncapsOutputStream out = new EncapsOutputStream(myORB);
-+ EncapsOutputStream out =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB);
-
- context.write( out, GIOPVersion.V1_2 );
- InputStream inputStream = out.create_input_stream();
-@@ -691,8 +692,8 @@
- {
- int id = 0 ;
- // Convert IOP.service_context to core.ServiceContext:
-- EncapsOutputStream outputStream = new EncapsOutputStream(
-- myORB );
-+ EncapsOutputStream outputStream =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(myORB);
- InputStream inputStream = null;
- UnknownServiceContext coreServiceContext = null;
- ServiceContextHelper.write( outputStream, service_context );
-diff --git a/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java b/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPInputStream.java
-@@ -300,11 +300,11 @@
- resetStream();
- }
-
-- public final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) {
-+ final void setOrbStream(org.omg.CORBA_2_3.portable.InputStream os) {
- orbStream = os;
- }
-
-- public final org.omg.CORBA_2_3.portable.InputStream getOrbStream() {
-+ final org.omg.CORBA_2_3.portable.InputStream getOrbStream() {
- return orbStream;
- }
-
-@@ -327,11 +327,11 @@
- return (javax.rmi.CORBA.ValueHandler) vhandler;
- }
-
-- public final void increaseRecursionDepth(){
-+ final void increaseRecursionDepth(){
- recursionDepth++;
- }
-
-- public final int decreaseRecursionDepth(){
-+ final int decreaseRecursionDepth(){
- return --recursionDepth;
- }
-
-diff --git a/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java b/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/IIOPOutputStream.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1998, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1998, 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
-@@ -124,19 +124,19 @@
- }
- }
-
-- public final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) {
-+ final void setOrbStream(org.omg.CORBA_2_3.portable.OutputStream os) {
- orbStream = os;
- }
-
-- public final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() {
-+ final org.omg.CORBA_2_3.portable.OutputStream getOrbStream() {
- return orbStream;
- }
-
-- public final void increaseRecursionDepth(){
-+ final void increaseRecursionDepth(){
- recursionDepth++;
- }
-
-- public final int decreaseRecursionDepth(){
-+ final int decreaseRecursionDepth(){
- return --recursionDepth;
- }
-
-diff --git a/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java b/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/InputStreamHook.java
-@@ -251,7 +251,7 @@
- }
-
- protected abstract byte getStreamFormatVersion();
-- protected abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream();
-+ abstract org.omg.CORBA_2_3.portable.InputStream getOrbStream();
-
- // Description of possible actions
- protected static class ReadObjectState {
-diff --git a/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java b/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/io/OutputStreamHook.java
-@@ -179,7 +179,7 @@
- putFields.write(this);
- }
-
-- public abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream();
-+ abstract org.omg.CORBA_2_3.portable.OutputStream getOrbStream();
-
- protected abstract void beginOptionalCustomData();
-
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java b/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/EncapsulationUtility.java
-@@ -128,7 +128,8 @@
- static public void writeEncapsulation( WriteContents obj,
- OutputStream os )
- {
-- EncapsOutputStream out = new EncapsOutputStream( (ORB)os.orb() ) ;
-+ EncapsOutputStream out =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)os.orb());
-
- out.putEndian() ;
-
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java b/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/GenericTaggedProfile.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -95,7 +95,8 @@
-
- public org.omg.IOP.TaggedProfile getIOPProfile()
- {
-- EncapsOutputStream os = new EncapsOutputStream( orb ) ;
-+ EncapsOutputStream os =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(orb);
- write( os ) ;
- InputStream is = (InputStream)(os.create_input_stream()) ;
- return org.omg.IOP.TaggedProfileHelper.read( is ) ;
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/IORImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -213,7 +213,8 @@
- {
- StringWriter bs;
-
-- MarshalOutputStream s = new EncapsOutputStream(factory);
-+ MarshalOutputStream s =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(factory);
- s.putEndian();
- write( (OutputStream)s );
- bs = new StringWriter();
-@@ -237,7 +238,8 @@
- }
-
- public org.omg.IOP.IOR getIOPIOR() {
-- EncapsOutputStream os = new EncapsOutputStream(factory);
-+ EncapsOutputStream os =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(factory);
- write(os);
- InputStream is = (InputStream) (os.create_input_stream());
- return org.omg.IOP.IORHelper.read(is);
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/ObjectKeyImpl.java
-@@ -87,7 +87,8 @@
-
- public byte[] getBytes( org.omg.CORBA.ORB orb )
- {
-- EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ;
-+ EncapsOutputStream os =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb);
- write( os ) ;
- return os.toByteArray() ;
- }
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/TaggedComponentFactoryFinderImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -61,7 +61,8 @@
- public TaggedComponent create( org.omg.CORBA.ORB orb,
- org.omg.IOP.TaggedComponent comp )
- {
-- EncapsOutputStream os = new EncapsOutputStream( (ORB)orb ) ;
-+ EncapsOutputStream os =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)orb);
- org.omg.IOP.TaggedComponentHelper.write( os, comp ) ;
- InputStream is = (InputStream)(os.create_input_stream() ) ;
- // Skip the component ID: we just wrote it out above
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -247,7 +247,8 @@
-
- public org.omg.IOP.TaggedProfile getIOPProfile()
- {
-- EncapsOutputStream os = new EncapsOutputStream( orb ) ;
-+ EncapsOutputStream os =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(orb);
- os.write_long( getId() ) ;
- write( os ) ;
- InputStream is = (InputStream)(os.create_input_stream()) ;
-diff --git a/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java b/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/ior/iiop/IIOPProfileTemplateImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2000, 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
-@@ -132,8 +132,9 @@
- // Note that this cannot be accomplished with a codec!
-
- // Use the byte order of the given stream
-- OutputStream encapsulatedOS = new EncapsOutputStream( (ORB)os.orb(),
-- ((CDROutputStream)os).isLittleEndian() ) ;
-+ OutputStream encapsulatedOS =
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream(
-+ (ORB)os.orb(), ((CDROutputStream)os).isLittleEndian() ) ;
-
- okeyTemplate.write( id, encapsulatedOS ) ;
- EncapsulationUtility.writeOutputStream( encapsulatedOS, os ) ;
-diff --git a/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java b/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java
-@@ -564,7 +564,7 @@
- public synchronized org.omg.CORBA.portable.OutputStream create_output_stream()
- {
- checkShutdownState();
-- return new EncapsOutputStream(this);
-+ return sun.corba.OutputStreamFactory.newEncapsOutputStream(this);
- }
-
- /**
-diff --git a/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java b/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/orb/ORBSingleton.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1997, 2006, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1997, 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
-@@ -149,7 +149,7 @@
- }
-
- public OutputStream create_output_stream() {
-- return new EncapsOutputStream(this);
-+ return sun.corba.OutputStreamFactory.newEncapsOutputStream(this);
- }
-
- public TypeCode create_struct_tc(String id,
-diff --git a/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java b/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java
---- openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java
-+++ openjdk/corba/src/share/classes/com/sun/corba/se/impl/protocol/CorbaMessageMediatorImpl.java
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 2001, 2004, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 2001, 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
-@@ -1792,8 +1792,7 @@
-
- if (msg.getGIOPVersion().lessThan(GIOPVersion.V1_2)) {
- // locate msgs 1.0 & 1.1 :=> grow,
-- // REVISIT - build from factory
-- outputObject = new CDROutputObject(
-+ outputObject = sun.corba.OutputStreamFactory.newCDROutputObject(
- (ORB) messageMediator.getBroker(),
- this,
- GIOPVersion.V1_0,
-@@ -1802,8 +1801,7 @@
- ORBConstants.STREAM_FORMAT_VERSION_1);
- } else {
- // 1.2 :=> stream
-- // REVISIT - build from factory
-- outputObject = new CDROutputObject(
-+ outputObject = sun.corba.OutputStreamFactory.newCDROutputObject(
- (ORB) messageMediator.getBroker(),
- messageMediator,
- reply,
-@@ -1957,7 +1955,8 @@
- ReplyMessage.NEEDS_ADDRESSING_MODE,
- null, null);
- // REVISIT: via acceptor factory.
-- CDROutputObject outputObject = new CDROutputObject(
-+ CDROutputObject outputObject =
-+ sun.corba.OutputStreamFactory.newCDROutputObject(
- (ORB)messageMediator.getBroker(),
- this,
- messageMediator.getGIOPVersion(),
-@@ -2124,7 +2123,7 @@
- ex.printStackTrace(pw);
- pw.flush(); // NOTE: you must flush or baos will be empty.
- EncapsOutputStream encapsOutputStream =
-- new EncapsOutputStream((ORB)mediator.getBroker());
-+ sun.corba.OutputStreamFactory.newEncapsOutputStream((ORB)mediator.getBroker());
- encapsOutputStream.putEndian();
- encapsOutputStream.write_wstring(baos.toString());
- UnknownServiceContext serviceContext =
-@@ -2201,12 +2200,11 @@
- // REVISIT = do not use null.
- //
- if (messageMediator.getConnection() == null) {
-- // REVISIT - needs factory
- replyOutputObject =
More information about the distro-pkg-dev
mailing list