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

[Tom Elrod]

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

  Modified:    src/main/org/jboss/remoting/callback  Callback.java
  Log:
  JBREM-556 - fixed some problems with remoting versioning.
  
  Revision  Changes    Path
  1.5       +14 -1     JBossRemoting/src/main/org/jboss/remoting/callback/Callback.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Callback.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossRemoting/src/main/org/jboss/remoting/callback/Callback.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Callback.java	18 May 2006 07:55:30 -0000	1.4
  +++ Callback.java	25 Jul 2006 19:52:20 -0000	1.5
  @@ -23,6 +23,7 @@
   
   import org.jboss.remoting.InvocationRequest;
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.remoting.Version;
   
   import java.util.HashMap;
   import java.util.Map;
  @@ -36,11 +37,23 @@
    */
   public class Callback extends InvocationRequest
   {
  -   private static final long serialVersionUID = -9196653590434634454L;
  +   static final long serialVersionUID;
   
      public final static String CALLBACK_HANDLE_OBJECT_KEY = "callback_handle_object";
      public final static String SERVER_LOCATOR_KEY = "server_locator";
   
  +   static
  +   {
  +      if(Version.getDefaultVersion() == Version.VERSION_1)
  +      {
  +         serialVersionUID = -4778964132014467531L;
  +      }
  +      else
  +      {
  +         serialVersionUID = -9196653590434634454L;
  +      }
  +   }
  +
      /**
       * Constructs the callback object with any object payload.
       *