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

[Manik Surtani]

  User: msurtani
  Date: 06/07/19 17:34:44

  Modified:    src/org/jboss/cache/loader/tcp   TcpCacheServer.java
                        TcpCacheServerMBean.java
  Log:
  JBCACHE-657
  JBCACHE-594
  
  Revision  Changes    Path
  1.14      +12 -7     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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- TcpCacheServer.java	15 Mar 2006 16:02:40 -0000	1.13
  +++ TcpCacheServer.java	19 Jul 2006 21:34:44 -0000	1.14
  @@ -21,13 +21,14 @@
   /**
    * TCP-IP based CacheServer, configure TcpDelegatingCacheLoader with host and port of this server
    * @author Bela Ban
  - * @version $Id: TcpCacheServer.java,v 1.13 2006/03/15 16:02:40 genman Exp $
  + * @version $Id: TcpCacheServer.java,v 1.14 2006/07/19 21:34:44 msurtani Exp $
    */
   public class TcpCacheServer extends ServiceMBeanSupport implements TcpCacheServerMBean {
      ServerSocket    srv_sock;
      InetAddress     bind_addr=null;
      int             port=7500;
  -   TreeCacheMBean  cache;
  +   TreeCache       cache;
  +   //TreeCacheMBean cache;
      ObjectName      cache_name;
      String          config;
      boolean         running=true;
  @@ -72,11 +73,13 @@
         this.config=config;
      }
   
  -   public TreeCacheMBean getCache() {
  +   //public TreeCacheMBean getCache() {
  +    public TreeCache getCache() {
         return cache;
      }
   
  -   public void setCache(TreeCacheMBean cache) {
  +   public void setCache(TreeCache cache) {
  +//public void setCache(TreeCacheMBean cache) {
         this.cache=cache;
      }
   
  @@ -99,7 +102,7 @@
         if(cache == null) {
            // 1. check whether we have an object name, pointing to the cache MBean
            if(cache_name != null && server != null) {
  -            cache=(TreeCacheMBean)MBeanProxyExt.create(TreeCacheMBean.class, cache_name, server);
  +            cache=(TreeCache)MBeanProxyExt.create(TreeCache.class, cache_name, server);
            }
         }
   
  @@ -164,10 +167,12 @@
         Socket             sock=null;
         ObjectInputStream  input=null;
         ObjectOutputStream output=null;
  -      TreeCacheMBean     c;
  +      //TreeCacheMBean     c;
  +       TreeCache c;
         Thread             t=null;
   
  -      public Connection(Socket sock, TreeCacheMBean cache) throws IOException {
  +       public Connection(Socket sock, TreeCache cache) throws IOException {
  +      //public Connection(Socket sock, TreeCacheMBean cache) throws IOException {
            this.sock=sock;
            output=new ObjectOutputStream(sock.getOutputStream());
            input=new ObjectInputStream(sock.getInputStream());
  
  
  
  1.3       +6 -4      JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServerMBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TcpCacheServerMBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/loader/tcp/TcpCacheServerMBean.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- TcpCacheServerMBean.java	18 Jan 2006 10:44:41 -0000	1.2
  +++ TcpCacheServerMBean.java	19 Jul 2006 21:34:44 -0000	1.3
  @@ -1,6 +1,6 @@
   package org.jboss.cache.loader.tcp;
   
  -import org.jboss.cache.TreeCacheMBean;
  +import org.jboss.cache.TreeCache;
   import org.jboss.system.ServiceMBean;
   
   import javax.management.MalformedObjectNameException;
  @@ -8,7 +8,7 @@
   
   /**
    * @author Bela Ban
  - * @version $Id: TcpCacheServerMBean.java,v 1.2 2006/01/18 10:44:41 bela Exp $
  + * @version $Id: TcpCacheServerMBean.java,v 1.3 2006/07/19 21:34:44 msurtani Exp $
    */
   public interface TcpCacheServerMBean extends ServiceMBean {
      String getBindAddress();
  @@ -27,9 +27,11 @@
   
      void setConfig(String config);
   
  -   TreeCacheMBean getCache();
  +   //TreeCacheMBean getCache();
  +    TreeCache getCache();
   
  -   void setCache(TreeCacheMBean cache);
  +   void setCache(TreeCache cache);
  +    //void setCache(TreeCacheMBean cache);
   
      String getCacheName();