[jboss-cvs] JBossRemoting/src/main/org/jboss/remoting/transport/rmi ...

[Tom Elrod]

  User: telrod  
  Date: 06/07/25 15:52:21

  Modified:    src/main/org/jboss/remoting/transport/rmi 
                        RemotingRMIClientSocketFactory.java
  Log:
  JBREM-556 - fixed some problems with remoting versioning.
  
  Revision  Changes    Path
  1.9       +16 -2     JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RemotingRMIClientSocketFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/transport/rmi/RemotingRMIClientSocketFactory.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- RemotingRMIClientSocketFactory.java	6 Jul 2006 06:07:34 -0000	1.8
  +++ RemotingRMIClientSocketFactory.java	25 Jul 2006 19:52:21 -0000	1.9
  @@ -22,6 +22,8 @@
   
   package org.jboss.remoting.transport.rmi;
   
  +import org.jboss.remoting.Version;
  +
   import javax.net.SocketFactory;
   import java.io.IOException;
   import java.io.Serializable;
  @@ -55,7 +57,7 @@
    * with localhost will allow the retrieval of objects bound to localhost.
    *
    * @author <a href="mailto:r.sigal at computer.org">Ron Sigal</a>
  - * @version $Revision: 1.8 $
  + * @version $Revision: 1.9 $
    *          <p/>
    *          Copyright (c) 2005
    *          </p>
  @@ -63,6 +65,8 @@
   
   public class RemotingRMIClientSocketFactory implements RMIClientSocketFactory, Serializable
   {
  +   static final long serialVersionUID;
  +
      transient protected SocketFactory socketFactory;
      private int timeout = 60000;
   
  @@ -82,8 +86,18 @@
      protected String hostName;
   
      private static int defaultHashCode = "RemotingRMISocketFactory".hashCode();
  -   private static final long serialVersionUID = -3039839695840773968L;
   
  +   static
  +   {
  +      if(Version.getDefaultVersion() == Version.VERSION_1)
  +      {
  +         serialVersionUID = -7491556589517716155L;
  +      }
  +      else
  +      {
  +         serialVersionUID = -3039839695840773968L;
  +      }
  +   }
   
      /**
       */