User: osh     
  Date: 00/11/01 12:36:29

  Modified:    src/main/org/jboss/tm TxCapsule.java
  Log:
  Quick fix for performance problem
  
  Revision  Changes    Path
  1.19      +41 -37    jboss/src/main/org/jboss/tm/TxCapsule.java
  
  Index: TxCapsule.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/tm/TxCapsule.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- TxCapsule.java    2000/10/21 16:24:00     1.18
  +++ TxCapsule.java    2000/11/01 20:36:29     1.19
  @@ -45,7 +45,7 @@
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
    *
  - *  @version $Revision: 1.18 $
  + *  @version $Revision: 1.19 $
    */
   class TxCapsule implements TimeoutTarget
   {
  @@ -1415,45 +1415,49 @@
      }
   
       private Xid createXid() {
  -        String name = System.getProperty("jboss.xa.xidclass", 
"org.jboss.tm.XidImpl");
  -        if(xidConstructor == null) {
  -            try {
  -                Class cls = Class.forName(name);
  -                xidConstructor = cls.getConstructor(new Class[]{Integer.TYPE, 
byte[].class, byte[].class});
  -            } catch(Exception e) {
  -                System.out.println("Unable to load Xid class '"+name+"'");
  -            }
  -        }
  -        try {
  -            Object xid = xidConstructor.newInstance(new Object[]{new 
Integer(XidImpl.getJbossFormatId()),
  -                                                                 
XidImpl.getGlobalIdString(XidImpl.getNextId()),
  -                                                                 
XidImpl.noBranchQualifier});
  -            return (Xid)xid;
  -        } catch(Exception e) {
  -            System.out.println("Unable to create an Xid (reverting to default 
impl): "+e);
  -            return new XidImpl(XidImpl.getJbossFormatId(), 
XidImpl.getGlobalIdString(XidImpl.getNextId()), XidImpl.noBranchQualifier);
  -        }
  +       if (xidConstructor == null) {
  +          String name = System.getProperty("jboss.xa.xidclass", 
"org.jboss.tm.XidImpl");
  +
  +          try {
  +             Class cls = Class.forName(name);
  +             xidConstructor = cls.getConstructor(new Class[]{Integer.TYPE, 
byte[].class, byte[].class});
  +          } catch (Exception e) {
  +             System.out.println("Unable to load Xid class '"+name+"'");
  +          }
  +       }
  +
  +       try {
  +          Object xid = xidConstructor.newInstance(new Object[]{new 
Integer(XidImpl.getJbossFormatId()),
  +                                                               
XidImpl.getGlobalIdString(XidImpl.getNextId()),
  +                                                               
XidImpl.noBranchQualifier});
  +          return (Xid)xid;
  +       } catch (Exception e) {
  +          System.out.println("Unable to create an Xid (reverting to default impl): 
"+e);
  +          return new XidImpl(XidImpl.getJbossFormatId(), 
XidImpl.getGlobalIdString(XidImpl.getNextId()), XidImpl.noBranchQualifier);
  +       }
       }
   
       private Xid createXid(Xid lastBranch) {
  -        String name = System.getProperty("jboss.xa.xidclass", 
"org.jboss.tm.XidImpl");
  -        if(xidConstructor == null) {
  -            try {
  -                Class cls = Class.forName(name);
  -                xidConstructor = cls.getConstructor(new Class[]{Integer.TYPE, 
byte[].class, byte[].class});
  -            } catch(Exception e) {
  -                System.out.println("Unable to load Xid class '"+name+"'");
  -            }
  -        }
  -        try {
  -            Object xid = xidConstructor.newInstance(new Object[]{new 
Integer(XidImpl.getJbossFormatId()),
  -                                                                 
XidImpl.getGlobalIdString(XidImpl.getNextId()),
  -                                                                 
XidImpl.getNextBranchQualifier(lastBranch.getBranchQualifier())});
  -            return (Xid)xid;
  -        } catch(Exception e) {
  -            System.out.println("Unable to create an Xid (reverting to default 
impl): "+e);
  -            return new XidImpl(XidImpl.getJbossFormatId(), 
XidImpl.getGlobalIdString(XidImpl.getNextId()), XidImpl.noBranchQualifier);
  -        }
  +       if (xidConstructor == null) {
  +          String name = System.getProperty("jboss.xa.xidclass", 
"org.jboss.tm.XidImpl");
  +
  +          try {
  +             Class cls = Class.forName(name);
  +             xidConstructor = cls.getConstructor(new Class[]{Integer.TYPE, 
byte[].class, byte[].class});
  +          } catch (Exception e) {
  +             System.out.println("Unable to load Xid class '"+name+"'");
  +          }
  +       }
  +
  +       try {
  +          Object xid = xidConstructor.newInstance(new Object[]{new 
Integer(XidImpl.getJbossFormatId()),
  +                                                               
XidImpl.getGlobalIdString(XidImpl.getNextId()),
  +                                                               
XidImpl.getNextBranchQualifier(lastBranch.getBranchQualifier())});
  +          return (Xid)xid;
  +       } catch (Exception e) {
  +          System.out.println("Unable to create an Xid (reverting to default impl): 
"+e);
  +          return new XidImpl(XidImpl.getJbossFormatId(), 
XidImpl.getGlobalIdString(XidImpl.getNextId()), XidImpl.noBranchQualifier);
  +       }
       }
   
      // Inner classes -------------------------------------------------
  
  
  

Reply via email to