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

[djencks]

djencks     2005/09/11 16:40:30

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

  Forward port M4 change to head
  
  Revision  Changes    Path
  1.20      +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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- Util.java 13 Jul 2005 20:49:28 -0000      1.19
  +++ Util.java 11 Sep 2005 20:40:29 -0000      1.20
  @@ -458,11 +458,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) {