User: fleury  
  Date: 00/09/29 17:59:39

  Modified:    src/main/org/jboss/ejb CacheKey.java EnterpriseContext.java
                        MethodInvocation.java
  Log:
  Commented out debug messages
  
  Revision  Changes    Path
  1.7       +6 -1      jboss/src/main/org/jboss/ejb/CacheKey.java
  
  Index: CacheKey.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/CacheKey.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- CacheKey.java     2000/09/28 01:16:58     1.6
  +++ CacheKey.java     2000/09/30 00:59:39     1.7
  @@ -19,7 +19,7 @@
   *
   *   @see org.jboss.ejb.plugins.NoPassivationInstanceCache.java
   *   @author <a href="[EMAIL PROTECTED]">Marc Fleury</a>
  -*   @version $Revision: 1.6 $
  +*   @version $Revision: 1.7 $
   */
   public class CacheKey
       implements java.io.Externalizable
  @@ -96,6 +96,11 @@
           }
           return false;
       }
  +     
  +     public String toString()
  +     {
  +             return id.toString();
  +     }
       
       // Inner classes -------------------------------------------------
   }
  
  
  
  1.14      +9 -12     jboss/src/main/org/jboss/ejb/EnterpriseContext.java
  
  Index: EnterpriseContext.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/EnterpriseContext.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- EnterpriseContext.java    2000/09/28 01:16:58     1.13
  +++ EnterpriseContext.java    2000/09/30 00:59:39     1.14
  @@ -36,7 +36,7 @@
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>
    *  @author <a href="mailto:[EMAIL PROTECTED]">Sebastien Alborini</a>
  - *   @version $Revision: 1.13 $
  + *   @version $Revision: 1.14 $
    */
   public abstract class EnterpriseContext
   {
  @@ -92,7 +92,7 @@
   
      public void setTransaction(Transaction transaction) {
          
  -       Logger.debug("EnterpriseContext.setTransaction "+((transaction == null) ? 
"null" : Integer.toString(transaction.hashCode()))); 
  +//DEBUG       Logger.debug("EnterpriseContext.setTransaction "+((transaction == 
null) ? "null" : Integer.toString(transaction.hashCode()))); 
          this.transaction = transaction; 
       }
       
  @@ -111,7 +111,7 @@
                
                //new Exception().printStackTrace();
                
  -             Logger.debug("EnterpriseContext.lock() "+hashCode()+" "+locked);
  +//DEBUG              Logger.debug("EnterpriseContext.lock() "+hashCode()+" 
"+locked);
       }
       
       public void unlock() {
  @@ -122,13 +122,12 @@
                //new Exception().printStackTrace();
                if (locked <0) new Exception().printStackTrace();
                
  -             Logger.debug("EnterpriseContext.unlock() "+hashCode()+" "+locked);
  +//DEBUG              Logger.debug("EnterpriseContext.unlock() "+hashCode()+" 
"+locked);
       }
       
       public boolean isLocked() {
               
  -       //DEBUG Logger.debug("EnterpriseContext.isLocked() at "+locked);
  -       Logger.debug("EnterpriseContext.isLocked() "+hashCode()+" at "+locked);
  +//DEBUG       Logger.debug("EnterpriseContext.isLocked() "+hashCode()+" at 
"+locked);
          
          return locked != 0;
      }
  @@ -211,7 +210,7 @@
               return con.getTransactionManager().getStatus() == 
Status.STATUS_MARKED_ROLLBACK; 
            } catch (SystemException e)
            {
  -            Logger.debug(e);
  +//DEBUG            Logger.debug(e);
               return true;
            }
         }
  @@ -269,7 +268,7 @@
           
           
           // DEBUG Logger.debug("UserTransactionImpl.begin " + transaction.hashCode() 
+ " in UserTransactionImpl " + this.hashCode());
  -        Logger.debug("UserTransactionImpl.begin " + transaction.hashCode() + " in 
UserTransactionImpl " + this.hashCode());
  +//DEBUG        Logger.debug("UserTransactionImpl.begin " + transaction.hashCode() + 
" in UserTransactionImpl " + this.hashCode());
           
         }
         
  @@ -281,8 +280,7 @@
                      java.lang.IllegalStateException,
                      SystemException
         {
  -         // DEBUG Logger.debug("UserTransactionImpl.commit " + 
transaction.hashCode() + " in UserTransactionImpl " + this.hashCode());
  -        Logger.debug("UserTransactionImpl.commit " + transaction.hashCode() + " in 
UserTransactionImpl " + this.hashCode());
  +//DEBUG        Logger.debug("UserTransactionImpl.commit " + transaction.hashCode() 
+ " in UserTransactionImpl " + this.hashCode());
           
           con.getTransactionManager().commit();
         }
  @@ -292,8 +290,7 @@
                        java.lang.SecurityException,
                        SystemException
         {
  -         // DEBUG Logger.debug("UserTransactionImpl.rollback " + 
transaction.hashCode() + " in UserTransactionImpl " + this.hashCode());
  -        Logger.debug("UserTransactionImpl.rollback " + transaction.hashCode() + " 
in UserTransactionImpl " + this.hashCode());
  +//DEBUG        Logger.debug("UserTransactionImpl.rollback " + 
transaction.hashCode() + " in UserTransactionImpl " + this.hashCode());
           
           con.getTransactionManager().rollback();
         }
  
  
  
  1.7       +2 -2      jboss/src/main/org/jboss/ejb/MethodInvocation.java
  
  Index: MethodInvocation.java
  ===================================================================
  RCS file: /products/cvs/ejboss/jboss/src/main/org/jboss/ejb/MethodInvocation.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MethodInvocation.java     2000/09/28 01:16:59     1.6
  +++ MethodInvocation.java     2000/09/30 00:59:39     1.7
  @@ -27,7 +27,7 @@
    *   @see <related>
    *   @author Rickard �berg ([EMAIL PROTECTED])
    *  @author <a href="mailto:[EMAIL PROTECTED]">Marc Fleury</a>.
  - *   @version $Revision: 1.6 $
  + *   @version $Revision: 1.7 $
    */
   public class MethodInvocation
   {
  @@ -82,7 +82,7 @@
        public void setTransaction(Transaction tx)
        {
                
  -             Logger.debug("Setting a transaction on Method invocation"+hashCode()+" 
"+m.getName()+" with "+tx);
  +//DEBUG              Logger.debug("Setting a transaction on Method 
invocation"+hashCode()+" "+m.getName()+" with "+tx);
                
                this.tx = tx;
                
  
  
  

Reply via email to