[infinispan-commits] Infinispan SVN: r633 - trunk/core/src/main/java/org/infinispan/marshall.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-08-05 11:13:44 -0400 (Wed, 05 Aug 2009)
New Revision: 633

Modified:
   trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
Log:
Made non-volatile

Modified: trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java	2009-08-05 11:27:49 UTC (rev 632)
+++ trunk/core/src/main/java/org/infinispan/marshall/VersionAwareMarshaller.java	2009-08-05 15:13:44 UTC (rev 633)
@@ -23,6 +23,7 @@
 
 import org.infinispan.commands.RemoteCommandFactory;
 import org.infinispan.factories.annotations.Inject;
+import org.infinispan.factories.annotations.NonVolatile;
 import org.infinispan.factories.annotations.Start;
 import org.infinispan.factories.annotations.Stop;
 import org.infinispan.io.ByteBuffer;
@@ -43,10 +44,11 @@
  * information to the stream when marshalling objects and is able to pick the appropriate marshaller to delegate to
  * based on the versioning information when unmarshalling objects.
  *
- * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
+ * @author Manik Surtani
  * @author Galder Zamarreño
  * @since 4.0
  */
+ at NonVolatile
 public class VersionAwareMarshaller extends AbstractMarshaller {
    private static final Log log = LogFactory.getLog(VersionAwareMarshaller.class);
    private boolean trace = log.isTraceEnabled();
@@ -67,12 +69,13 @@
       this.loader = loader;
       this.remoteCommandFactory = remoteCommandFactory;
    }
-   
-   @Start(priority = 9) // should start before Transport component
+
+   @Start(priority = 9)
+   // should start before Transport component
    public void start() {
       defaultMarshaller.start(loader, remoteCommandFactory, this);
    }
-   
+
    @Stop
    public void stop() {
       defaultMarshaller.stop();
@@ -109,7 +112,7 @@
       ObjectOutput out = defaultMarshaller.startObjectOutput(os, isReentrant);
       try {
          out.writeShort(VERSION_400);
-         if (trace) log.trace("Wrote version {0}", VERSION_400);         
+         if (trace) log.trace("Wrote version {0}", VERSION_400);
       } catch (Exception e) {
          finishObjectOutput(out);
          log.error("Unable to read version id from first two bytes of stream, barfing.");