[openejb-scm] openejb/modules/core/src/java/org/openejb/corba/util Util.java

[dain]

dain        2005/08/01 00:06:48

  Modified:    modules/core/src/java/org/openejb/corba/util Tag: v2_0_G1M4
                        Util.java
  Log:

  Only try to copy serializable objects
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.18.4.1  +8 -6      
openejb/modules/core/src/java/org/openejb/corba/util/Util.java
  
  Index: Util.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/corba/util/Util.java,v
  retrieving revision 1.18
  retrieving revision 1.18.4.1
  diff -u -r1.18 -r1.18.4.1
  --- Util.java 1 Jul 2005 19:34:36 -0000       1.18
  +++ Util.java 1 Aug 2005 04:06:48 -0000       1.18.4.1
  @@ -449,11 +449,13 @@
   
                   // copy the result to force replacement
                   // corba does not call writeReplace on remote proxies
  -                try {
  -                    object = 
SerializationHandler.copyObj(Thread.currentThread().getContextClassLoader(), 
object);
  -                } catch (Exception e) {
  -                    log.debug("Exception in result copy", e);
  -                    throw new UnknownException(e);
  +                if (object instanceof Serializable) {
  +                    try {
  +                        object = 
SerializationHandler.copyObj(Thread.currentThread().getContextClassLoader(), 
object);
  +                    } catch (Exception e) {
  +                        log.debug("Exception in result copy", e);
  +                        throw new UnknownException(e);
  +                    }
                   }
   
                   if (type == Object.class || type == Serializable.class) {