[jBoss-Dev] CVS update: jboss/src/main/org/jboss/tm TxCapsule.java

[jBoss CVS Development]

  User: fleury  
  Date: 00/09/29 14:25:22

  Modified:    src/main/org/jboss/tm TxCapsule.java
  Log:
  Updated exception handling in entire server
  Log is now inherited in child threads (e.g. useful for Tomcat which spawns threads)
  
  Revision  Changes    Path
  1.10      +9 -9      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TxCapsule.java    2000/09/28 21:10:11     1.9
  +++ TxCapsule.java    2000/09/29 21:25:21     1.10
  @@ -43,7 +43,7 @@
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Ole Husgaard</a>
    *
  - *  @version $Revision: 1.9 $
  + *  @version $Revision: 1.10 $
    */
   class TxCapsule implements TimeoutTarget
   {
  @@ -902,7 +902,7 @@
      private void startResource(XAResource xaRes, int flags)
         throws XAException
      {
  -System.err.println("TxCapsule.startResource(" + xid.toString() +
  +             Logger.debug("TxCapsule.startResource(" + xid.toString() +
                      ") entered: " + xaRes.toString() +
                      " flags=" + flags);
         unlock();
  @@ -910,7 +910,7 @@
            xaRes.start(xid, flags);
         } finally {
            lock();
  -System.err.println("TxCapsule.startResource(" + xid.toString() +
  +             Logger.debug("TxCapsule.startResource(" + xid.toString() +
                      ") leaving: " + xaRes.toString() +
                      " flags=" + flags);
         }
  @@ -923,7 +923,7 @@
      private void endResource(XAResource xaRes, int flag)
         throws XAException
      {
  -System.err.println("TxCapsule.endResource(" + xid.toString() +
  +             Logger.debug("TxCapsule.endResource(" + xid.toString() +
                      ") entered: " + xaRes.toString() +
                      " flag=" + flag);
         unlock();
  @@ -931,7 +931,7 @@
            xaRes.end(xid, flag);
         } finally {
            lock();
  -System.err.println("TxCapsule.endResource(" + xid.toString() +
  +             Logger.debug("TxCapsule.endResource(" + xid.toString() +
                      ") leaving: " + xaRes.toString() +
                      " flag=" + flag);
         }
  @@ -961,13 +961,13 @@
                  resourceState[i] = RS_ENLISTED;
               }
               if (resourceState[i] == RS_ENLISTED) {
  -System.err.println("endresources("+i+"): state="+resourceState[i]);
  +                       Logger.debug("endresources("+i+"): state="+resourceState[i]);
                 endResource(resources[i], XAResource.TMSUCCESS);
                 resourceState[i] = RS_ENDED;
               }
            } catch(XAException e) {
  -System.err.println("endresources: XAException: " + e);
  -System.err.println("endresources: XAException: errorCode=" + e.errorCode);
  +                     Logger.debug("endresources: XAException: " + e);
  +                     Logger.debug("endresources: XAException: errorCode=" + 
e.errorCode);
               Logger.exception(e);
               status = Status.STATUS_MARKED_ROLLBACK;
            }
  @@ -1204,7 +1204,7 @@
         status = Status.STATUS_COMMITTING;
   
         for (int i = 0; i < resourceCount; i++) {
  -System.err.println("TxCapsule.commitResources(): 
resourceStates["+i+"]="+resourceState[i]);
  +             Logger.debug("TxCapsule.commitResources(): 
resourceStates["+i+"]="+resourceState[i]);
            if (!onePhase && resourceState[i] != RS_VOTE_OK)
              continue;