[infinispan-commits] Infinispan SVN: r1514 - in trunk/core/src: test/java/org/infinispan/marshall and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-02-17 06:02:49 -0500 (Wed, 17 Feb 2010)
New Revision: 1514

Modified:
   trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
   trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
Log:
Fix javadoc and improved logging.

Modified: trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java	2010-02-16 18:20:41 UTC (rev 1513)
+++ trunk/core/src/main/java/org/infinispan/interceptors/MarshalledValueInterceptor.java	2010-02-17 11:02:49 UTC (rev 1514)
@@ -193,8 +193,8 @@
 
    private Object processRetVal(Object retVal) throws IOException, ClassNotFoundException {
       if (retVal instanceof MarshalledValue) {
-         if (trace) log.trace("Return value is a MarshalledValue.  Unwrapping.");
          retVal = ((MarshalledValue) retVal).get();
+         if (trace) log.trace("Return value is a MarshalledValue.  Unwrapped: {0}", retVal);
       }
       return retVal;
    }

Modified: trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java	2010-02-16 18:20:41 UTC (rev 1513)
+++ trunk/core/src/test/java/org/infinispan/marshall/TestObjectStreamMarshaller.java	2010-02-17 11:02:49 UTC (rev 1514)
@@ -15,8 +15,8 @@
 import java.io.OutputStream;
 
 /**
- * A dummy marshaller impl that uses JBoss Marshalling object streams as they do not require that the objects being
- * serialized/deserialized implement Serializable.
+ * A dummy marshaller impl that uses object streams converted via XStream as current JBoss Marshalling implementation
+ * requires that the objects being serialized/deserialized implement Serializable or Externalizable.
  *
  * @author Manik Surtani
  */