[gf-corba-v3-mirror~gfv2-master:22] Bug ID: #6917814

[TanujaKotappa@kenai.com]

Project:    gf-corba-v3-mirror
Repository: gfv2-master
Revision:   22
Author:     TanujaKotappa
Date:       2010-02-02 11:46:58 UTC
Link:       

Log Message:
------------
Bug ID: #6917814
Modified Files: 
optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierFactoryPipelineImpl.java
optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierBase.java

Reviwer: Ken


Revisions:
----------
22


Modified Paths:
---------------
optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierBase.java
optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierFactoryPipelineImpl.java


Diffs:
------
diff -r f1d8a20d964b -r 2a8178e2a28e 
optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierBase.java
--- 
a/optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierBase.java
  Thu Nov 05 22:17:35 2009 -0800
+++ 
b/optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierBase.java
  Tue Feb 02 17:16:58 2010 +0530
@@ -117,9 +117,13 @@
     {
        Object result = oldToNew.get( source ) ;
        if (result == null) {
-           result = createCopy( source, debug ) ;
-           oldToNew.put( source, result ) ;
-           result = doCopy( oldToNew, source, result, debug ) ;
+            try {
+                 result = createCopy( source, debug ) ;
+                 oldToNew.put( source, result ) ;
+                 result = doCopy( oldToNew, source, result, debug ) ;
+            } catch (StackOverflowError ex) {
+                 throw new ReflectiveCopyException(ex.getMessage(),ex);
+            }
        }
        return result ;
     }

diff -r f1d8a20d964b -r 2a8178e2a28e 
optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierFactoryPipelineImpl.java
--- 
a/optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierFactoryPipelineImpl.java
   Thu Nov 05 22:17:35 2009 -0800
+++ 
b/optional/src/share/classes/com/sun/corba/se/impl/orbutil/copyobject/ClassCopierFactoryPipelineImpl.java
   Tue Feb 02 17:16:58 2010 +0530
@@ -84,6 +84,7 @@
        Thread.class, 
        ThreadGroup.class, 
        ProcessBuilder.class,
+        java.util.LinkedHashMap.class,
     } ;
 
     // List of some immutable classes that are copied simply