[jboss-cvs] JBossCache/src/org/jboss/cache/loader/tcp ...

[Vladmir Blagojevic]

  User: vblagojevic
  Date: 06/08/31 10:56:46

  Modified:    src/org/jboss/cache/loader/tcp  TcpCacheServer.java
  Log:
  CacheLoader API change (remove byte based load/store)
  
  Revision  Changes    Path
  1.16      +7 -5      JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TcpCacheServer.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- TcpCacheServer.java	20 Jul 2006 11:48:25 -0000	1.15
  +++ TcpCacheServer.java	31 Aug 2006 14:56:46 -0000	1.16
  @@ -32,7 +32,7 @@
   /**
    * TCP-IP based CacheServer, configure TcpDelegatingCacheLoader with host and port of this server
    * @author Bela Ban
  - * @version $Id: TcpCacheServer.java,v 1.15 2006/07/20 11:48:25 msurtani Exp $
  + * @version $Id: TcpCacheServer.java,v 1.16 2006/08/31 14:56:46 vblagojevic Exp $
    */
   public class TcpCacheServer extends ServiceMBeanSupport implements TcpCacheServerMBean {
      ServerSocket    srv_sock;
  @@ -304,13 +304,15 @@
                        output.writeObject(Boolean.TRUE);
                        break;
                     case DelegatingCacheLoader.delegateLoadEntireState:
  -                     state=c.getCacheLoader() != null? c.getCacheLoader().loadEntireState() : null;
  -                     output.writeObject(state);
  +                     ObjectOutputStream os=(ObjectOutputStream)input.readObject();
  +                     if(c.getCacheLoader() != null)
  +                        c.getCacheLoader().loadEntireState(os);
  +                     output.writeObject(Boolean.TRUE);
                        break;
                     case DelegatingCacheLoader.delegateStoreEntireState:
  -                     state=(byte[])input.readObject();
  +                     ObjectInputStream is = (ObjectInputStream)input.readObject();
                        if(c.getCacheLoader() != null)
  -                        c.getCacheLoader().storeEntireState(state);
  +                        c.getCacheLoader().storeEntireState(is);
                        output.writeObject(Boolean.TRUE);
                        break;
                     default: