User: fleury  
  Date: 00/12/08 16:07:02

  Modified:    src/main/org/jboss/ejb/plugins/jrmp/server
                        JRMPContainerInvoker.java
  Log:
  bug in 1.2.2 detection
  
  Revision  Changes    Path
  1.31      +5 -11     
jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java
  
  Index: JRMPContainerInvoker.java
  ===================================================================
  RCS file: 
/products/cvs/ejboss/jboss/src/main/org/jboss/ejb/plugins/jrmp/server/JRMPContainerInvoker.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- JRMPContainerInvoker.java 2000/12/07 15:44:46     1.30
  +++ JRMPContainerInvoker.java 2000/12/09 00:07:01     1.31
  @@ -72,7 +72,8 @@
    *      @author Rickard �berg ([EMAIL PROTECTED])
    *           @author <a href="mailto:[EMAIL PROTECTED]">Sebastien 
Alborini</a>
    *      @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
  - *      @version $Revision: 1.30 $
  + *           @author <a href="mailto:[EMAIL PROTECTED]">Juha Lindfors</a>
  + *      @version $Revision: 1.31 $
    */
   public class JRMPContainerInvoker
      extends RemoteServer
  @@ -451,23 +452,16 @@
         String opt = MetaData.getElementContent(MetaData.getUniqueChild(element, 
"Optimized"));
         optimize = Boolean.valueOf(opt).booleanValue();
         
  -      String jdk = "122"; 
//MetaData.getElementContent(MetaData.getUniqueChild(element, "JDK"));
  -      if (jdk.equals("122"))
  -         jdk122 = true;
  -      else if (jdk.equals("auto"))
  -      {
  -         if (!(System.getProperty("java.vm.version").compareTo("1.3") >= 0))
  -            jdk122 = true;
  -      }
  +      if ((System.getProperty("java.vm.version").compareTo("1.3") >= 0)) jdk122 = 
false;
  +       else  jdk122 = true;
         
         // Create delegate depending on JDK version
         if (jdk122)
         {
            ciDelegate = new 
org.jboss.ejb.plugins.jrmp12.server.JRMPContainerInvoker(this);
         } else
  -      {/*
  +      {
            ciDelegate = new 
org.jboss.ejb.plugins.jrmp13.server.JRMPContainerInvoker(this);
  -         */
         }
         
         try
  
  
  

Reply via email to