geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting InvocationSupport.java InvocationType.java
Date Sat, 23 Aug 2003 09:07:12 GMT
jdillon     2003/08/23 02:07:12

  Modified:    modules/core/src/java/org/apache/geronimo/cache
                        SimpleInstanceCache.java
               modules/core/src/java/org/apache/geronimo/common
                        InvocationType.java
               modules/core/src/java/org/apache/geronimo/core/log
                        NamedNDCConverter.java
               modules/core/src/java/org/apache/geronimo/deployment/scanner
                        URLInfo.java WebDAVScanner.java
               modules/core/src/java/org/apache/geronimo/ejb
                        EJBInvocationUtil.java
               modules/core/src/java/org/apache/geronimo/ejb/cache
                        EnterpriseContextInstanceCache.java
                        StatefulInstanceInterceptor.java
               modules/core/src/java/org/apache/geronimo/ejb/container
                        EJBContainerUtil.java
               modules/core/src/java/org/apache/geronimo/ejb/context
                        CMTInterceptor.java ExecutionContext.java
                        StatefulBMTInterceptor.java
                        StatelessBMTInterceptor.java
                        TxExecutionContext.java
               modules/core/src/java/org/apache/geronimo/jmx
                        MBeanProxyFactory.java
                        RelationshipMBeanProxyFactory.java
               modules/core/src/java/org/apache/geronimo/lock
                        LockDomain.java LockInterceptor.java
                        WriterPreferredInstanceLock.java
                        WriterPreferredInstanceLock2.java
                        WriterPreferredInstanceLock3.java
               modules/core/src/java/org/apache/geronimo/remoting
                        InvocationSupport.java InvocationType.java
  Log:
   o Applied patch GERONIMO-9 (assert keyword/identifier) by Ralph Apel
  
  Revision  Changes    Path
  1.3       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/cache/SimpleInstanceCache.java
  
  Index: SimpleInstanceCache.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/cache/SimpleInstanceCache.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleInstanceCache.java	11 Aug 2003 17:59:09 -0000	1.2
  +++ SimpleInstanceCache.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -102,7 +102,7 @@
               value = inactive.remove(key);
           } else {
               // this should never happen because we don't let a key be in both maps
  -            // assert (inactive.remove(key) == null);
  +            // assert inactive.remove(key) == null;
           }
   
           return value;
  
  
  
  1.3       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/InvocationType.java
  
  Index: InvocationType.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/common/InvocationType.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- InvocationType.java	11 Aug 2003 17:59:10 -0000	1.2
  +++ InvocationType.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -89,8 +89,8 @@
       private final int ordinal;
   
       private InvocationType(String name, int ordinal, boolean local, boolean home) {
  -        assert(ordinal < MAX_ORIDNAL);
  -        assert(values[ordinal] == null);
  +        assert ordinal < MAX_ORIDNAL;
  +        assert values[ordinal] == null;
           this.name = name;
           this.local = local;
           this.home = home;
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/core/log/NamedNDCConverter.java
  
  Index: NamedNDCConverter.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/core/log/NamedNDCConverter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NamedNDCConverter.java	11 Aug 2003 17:59:10 -0000	1.2
  +++ NamedNDCConverter.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -71,7 +71,7 @@
       public NamedNDCConverter(FormattingInfo formattingInfo, String key) {
           super(formattingInfo);
           namedNDC = NamedNDC.getNamedNDC(key);
  -        assert (namedNDC != null);
  +        assert namedNDC != null;
       }
   
       protected String convert(LoggingEvent loggingEvent) {
  
  
  
  1.2       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/URLInfo.java
  
  Index: URLInfo.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/URLInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- URLInfo.java	12 Aug 2003 07:10:15 -0000	1.1
  +++ URLInfo.java	23 Aug 2003 09:07:11 -0000	1.2
  @@ -67,8 +67,8 @@
       private final URLType type;
   
       public URLInfo(URL url, URLType type) {
  -        assert (url != null) : "url was null";
  -        assert (type != null) : "type was null";
  +        assert url != null : "url was null";
  +        assert type != null : "type was null";
           this.url = url;
           this.type = type;
       }
  
  
  
  1.5       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/WebDAVScanner.java
  
  Index: WebDAVScanner.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/deployment/scanner/WebDAVScanner.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- WebDAVScanner.java	12 Aug 2003 07:10:15 -0000	1.4
  +++ WebDAVScanner.java	23 Aug 2003 09:07:11 -0000	1.5
  @@ -102,7 +102,7 @@
        * @param recurse if true, the scan will recurse into sub-collections
        */
       public WebDAVScanner(URL base, boolean recurse) {
  -        assert (base.toString().endsWith("/"));
  +        assert base.toString().endsWith("/");
           this.base = base;
           this.recurse = recurse;
   
  @@ -197,7 +197,7 @@
        * @throws IOException if there was a problem talking to the server
        */
       private Set scanCollection(URL collection) throws IOException {
  -        assert (collection.toString().endsWith("/"));
  +        assert collection.toString().endsWith("/");
           HttpMethod method = new PropfindMethod(collection.toString());
           try {
               method.setFollowRedirects(true);
  
  
  
  1.4       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBInvocationUtil.java
  
  Index: EJBInvocationUtil.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/EJBInvocationUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- EJBInvocationUtil.java	11 Aug 2003 17:59:11 -0000	1.3
  +++ EJBInvocationUtil.java	23 Aug 2003 09:07:11 -0000	1.4
  @@ -131,8 +131,8 @@
       private final int ordinal;
   
       private EJBInvocationUtil(String name, int ordinal) {
  -        assert(ordinal < MAX_ORIDNAL);
  -        assert(values[ordinal] == null);
  +        assert ordinal < MAX_ORIDNAL;
  +        assert values[ordinal] == null;
           this.name = name;
           this.ordinal = ordinal;
           values[ordinal] = this;
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstanceCache.java
  
  Index: EnterpriseContextInstanceCache.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/EnterpriseContextInstanceCache.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- EnterpriseContextInstanceCache.java	16 Aug 2003 23:16:43 -0000	1.5
  +++ EnterpriseContextInstanceCache.java	23 Aug 2003 09:07:11 -0000	1.6
  @@ -137,7 +137,7 @@
           if (!(value instanceof EnterpriseContext)) {
               throw new IllegalArgumentException("Value is not an instance of EnterpriseContext");
           }
  -        assert(key.equals(((EnterpriseContext) value).getId()));
  +        assert key.equals(((EnterpriseContext) value).getId());
           synchronized (cache) {
               //addBeanToTx();
   
  @@ -155,7 +155,7 @@
           if (!(value instanceof EnterpriseContext)) {
               throw new IllegalArgumentException("Value is not an instance of EnterpriseContext");
           }
  -        assert(key.equals(((EnterpriseContext) value).getId()));
  +        assert key.equals(((EnterpriseContext) value).getId());
           synchronized (cache) {
               //removeBeanFromTx();
               cache.putInactive(key, value);
  
  
  
  1.6       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatefulInstanceInterceptor.java
  
  Index: StatefulInstanceInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/cache/StatefulInstanceInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatefulInstanceInterceptor.java	16 Aug 2003 23:16:43 -0000	1.5
  +++ StatefulInstanceInterceptor.java	23 Aug 2003 09:07:11 -0000	1.6
  @@ -161,7 +161,7 @@
                       // the instance was removed
                       cache.remove(id);
                   } else {
  -                    assert (ctx.getId().equals(id));
  +                    assert ctx.getId().equals(id);
                   }
               }
           }
  
  
  
  1.3       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/EJBContainerUtil.java
  
  Index: EJBContainerUtil.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/container/EJBContainerUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EJBContainerUtil.java	11 Aug 2003 17:59:11 -0000	1.2
  +++ EJBContainerUtil.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -122,8 +122,8 @@
       private final int ordinal;
   
       private EJBContainerUtil(String name, int ordinal) {
  -        assert(ordinal < MAX_ORIDNAL);
  -        assert(values[ordinal] == null);
  +        assert ordinal < MAX_ORIDNAL;
  +        assert values[ordinal] == null;
           this.name = name;
           this.ordinal = ordinal;
           values[ordinal] = this;
  
  
  
  1.6       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/CMTInterceptor.java
  
  Index: CMTInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/CMTInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CMTInterceptor.java	16 Aug 2003 23:16:51 -0000	1.5
  +++ CMTInterceptor.java	23 Aug 2003 09:07:11 -0000	1.6
  @@ -330,7 +330,7 @@
       private InvocationResult sameTxContext(Invocation invocation, Transaction oldTransaction)
throws EJBTransactionException, Exception {
           TxExecutionContext context = TxExecutionContext.getContext(oldTransaction);
           if (context == null) {
  -            assert (oldTransaction != null);
  +            assert oldTransaction != null;
               try {
                   context = new TxExecutionContext(tm, oldTransaction);
               } catch (RollbackException e) {
  @@ -339,7 +339,7 @@
                   throw new EJBTransactionException("Unable to register with Transaction",
e);
               }
           } else {
  -            assert (context.getTransaction() == oldTransaction);
  +            assert context.getTransaction() == oldTransaction;
           }
           return invokeNext(context, invocation);
       }
  
  
  
  1.4       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/ExecutionContext.java
  
  Index: ExecutionContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/ExecutionContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ExecutionContext.java	11 Aug 2003 17:59:12 -0000	1.3
  +++ ExecutionContext.java	23 Aug 2003 09:07:11 -0000	1.4
  @@ -89,13 +89,13 @@
       }
   
       public static void push(ExecutionContext newContext) {
  -        assert (newContext != null);
  +        assert newContext != null;
           getList().addFirst(newContext);
       }
   
       public static void pop(ExecutionContext newContext) {
  -        assert (newContext != null);
  -        assert (getContext() == newContext);
  +        assert newContext != null;
  +        assert getContext() == newContext;
           getList().removeFirst();
       }
   
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatefulBMTInterceptor.java
  
  Index: StatefulBMTInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatefulBMTInterceptor.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StatefulBMTInterceptor.java	11 Aug 2003 17:59:12 -0000	1.3
  +++ StatefulBMTInterceptor.java	23 Aug 2003 09:07:11 -0000	1.4
  @@ -91,7 +91,7 @@
                       result = getNext().invoke(invocation);
                   } finally {
                       suspendInstanceTx(id);
  -                    assert (getTransaction() == null);
  +                    assert getTransaction() == null;
                   }
               } catch (Error e) {
                   // system exception
  
  
  
  1.6       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatelessBMTInterceptor.java
  
  Index: StatelessBMTInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/StatelessBMTInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StatelessBMTInterceptor.java	16 Aug 2003 23:16:51 -0000	1.5
  +++ StatelessBMTInterceptor.java	23 Aug 2003 09:07:11 -0000	1.6
  @@ -159,7 +159,7 @@
           ExecutionContext context = ExecutionContext.getContext();
           if (context instanceof TxExecutionContext) {
               ExecutionContext.pop(context);
  -            assert (ExecutionContext.getContext() == noTxContext);
  +            assert ExecutionContext.getContext() == noTxContext;
               context.abnormalTermination(e);
           }
   
  
  
  
  1.4       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TxExecutionContext.java
  
  Index: TxExecutionContext.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/ejb/context/TxExecutionContext.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- TxExecutionContext.java	11 Aug 2003 17:59:12 -0000	1.3
  +++ TxExecutionContext.java	23 Aug 2003 09:07:11 -0000	1.4
  @@ -100,7 +100,7 @@
       }
   
       public Transaction startTransaction() throws SystemException, NotSupportedException,
RollbackException {
  -        assert (tx == null);
  +        assert tx == null;
           tm.begin();
           tx = tm.getTransaction();
           registerWithTransaction();
  
  
  
  1.5       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/MBeanProxyFactory.java
  
  Index: MBeanProxyFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/MBeanProxyFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- MBeanProxyFactory.java	13 Aug 2003 21:18:47 -0000	1.4
  +++ MBeanProxyFactory.java	23 Aug 2003 09:07:11 -0000	1.5
  @@ -81,9 +81,9 @@
        * @return the new MBean proxy, which implemnts the specified interface
        */
       public static Object getProxy(Class iface, MBeanServer server, ObjectName objectName)
{
  -        assert (iface != null);
  -        assert (iface.isInterface());
  -        assert (server != null);
  +        assert iface != null;
  +        assert iface.isInterface();
  +        assert server != null;
   
           ClassLoader cl = iface.getClassLoader();
           return Proxy.newProxyInstance(cl, new Class[]{iface}, new LocalHandler(iface, server,
objectName));
  
  
  
  1.3       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/RelationshipMBeanProxyFactory.java
  
  Index: RelationshipMBeanProxyFactory.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/jmx/RelationshipMBeanProxyFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- RelationshipMBeanProxyFactory.java	20 Aug 2003 22:43:53 -0000	1.2
  +++ RelationshipMBeanProxyFactory.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -143,9 +143,9 @@
        * @return a dynamic proxy to the relationship which implements the interface defined
by the relationship\
        */
       public static Object getProxy(Class iface, MBeanServer server, String relationshipID,
String targetRole) {
  -        assert (iface != null);
  -        assert (iface.isInterface());
  -        assert (server != null);
  +        assert iface != null;
  +        assert iface.isInterface();
  +        assert server != null;
   
           ClassLoader cl = iface.getClassLoader();
           return Proxy.newProxyInstance(cl, new Class[]{iface}, new LocalHandler(iface, server,
relationshipID, targetRole));
  
  
  
  1.3       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/LockDomain.java
  
  Index: LockDomain.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/LockDomain.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LockDomain.java	11 Aug 2003 17:59:12 -0000	1.2
  +++ LockDomain.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -85,7 +85,7 @@
       }
   
       public InstanceLock getLock(Object key) {
  -        assert (key != null);
  +        assert key != null;
           InstanceLock lock;
           synchronized (locks) {
               processQueue();
  
  
  
  1.6       +2 -2      incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/LockInterceptor.java
  
  Index: LockInterceptor.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/LockInterceptor.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- LockInterceptor.java	16 Aug 2003 23:16:59 -0000	1.5
  +++ LockInterceptor.java	23 Aug 2003 09:07:11 -0000	1.6
  @@ -96,7 +96,7 @@
           ExecutionContext context = ExecutionContext.getContext();
           LockContext lockContext = context.getLockContext();
           Object id = EJBInvocationUtil.getId(invocation);
  -        assert (id != null);
  +        assert id != null;
   
           try {
               lockContext.exclusiveLock(lockDomain, id);
  
  
  
  1.3       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/WriterPreferredInstanceLock.java
  
  Index: WriterPreferredInstanceLock.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/WriterPreferredInstanceLock.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WriterPreferredInstanceLock.java	11 Aug 2003 17:59:12 -0000	1.2
  +++ WriterPreferredInstanceLock.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -81,7 +81,7 @@
       private final Object sharedLock = new Object();
   
       public void sharedLock(Object context) throws InterruptedException {
  -        assert (context != null);
  +        assert context != null;
           synchronized (sharedLock) {
               synchronized (this) {
                   // we can get the lock immediately if no-one has or is waiting
  @@ -118,7 +118,7 @@
       }
   
       public void exclusiveLock(Object context) throws InterruptedException {
  -        assert (context != null);
  +        assert context != null;
           synchronized (exclLock) {
               synchronized (this) {
                   // we can get the lock immediately if no-one has it and
  @@ -166,7 +166,7 @@
       }
   
       public void release(Object context) {
  -        assert (context != null);
  +        assert context != null;
           synchronized (exclLock) {
               synchronized (sharedLock) {
                   synchronized (this) {
  
  
  
  1.3       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/WriterPreferredInstanceLock2.java
  
  Index: WriterPreferredInstanceLock2.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/WriterPreferredInstanceLock2.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WriterPreferredInstanceLock2.java	11 Aug 2003 17:59:12 -0000	1.2
  +++ WriterPreferredInstanceLock2.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -80,7 +80,7 @@
       private final Object exclLock = new Object();
   
       public synchronized void sharedLock(Object context) throws InterruptedException {
  -        assert (context != null);
  +        assert context != null;
           // we can get the lock immediately if no-one has or is waiting
           // for an exclusive lock
           if (exclActive == null && exclWaiting == 0) {
  @@ -109,7 +109,7 @@
       }
   
       public synchronized void exclusiveLock(Object context) throws InterruptedException
{
  -        assert (context != null);
  +        assert context != null;
           // we can get the lock immediately if no-one has it and
           // no-one has a shared lock
           if (exclActive == null && sharedCount == 0) {
  @@ -150,7 +150,7 @@
   
   
       public synchronized void release(Object context) {
  -        assert (context != null);
  +        assert context != null;
           if (exclActive == context) {
               exclActive = null;
   
  
  
  
  1.3       +4 -4      incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/WriterPreferredInstanceLock3.java
  
  Index: WriterPreferredInstanceLock3.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/lock/WriterPreferredInstanceLock3.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- WriterPreferredInstanceLock3.java	11 Aug 2003 17:59:12 -0000	1.2
  +++ WriterPreferredInstanceLock3.java	23 Aug 2003 09:07:11 -0000	1.3
  @@ -80,7 +80,7 @@
       private final Object exclLock = new Object();
   
       public void sharedLock(Object context) throws InterruptedException {
  -        assert (context != null);
  +        assert context != null;
           synchronized (this) {
               // we can get the lock immediately if no-one has or is waiting
               // for an exclusive lock
  @@ -111,7 +111,7 @@
       }
   
       public void exclusiveLock(Object context) throws InterruptedException {
  -        assert (context != null);
  +        assert context != null;
           synchronized (exclLock) {
               synchronized (this) {
                   // we can get the lock immediately if no-one has it and
  @@ -159,7 +159,7 @@
       }
   
       public void release(Object context) {
  -        assert (context != null);
  +        assert context != null;
           synchronized (exclLock) {
               synchronized (this) {
                   if (exclActive == context) {
  
  
  
  1.2       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InvocationSupport.java
  
  Index: InvocationSupport.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InvocationSupport.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InvocationSupport.java	22 Aug 2003 02:23:26 -0000	1.1
  +++ InvocationSupport.java	23 Aug 2003 09:07:12 -0000	1.2
  @@ -92,8 +92,8 @@
       private final int ordinal;
   
       private InvocationSupport(String name, int ordinal) {
  -        assert(ordinal < MAX_ORIDNAL);
  -        assert(values[ordinal] == null);
  +        assert ordinal < MAX_ORIDNAL;
  +        assert values[ordinal] == null;
           this.name = name;
           this.ordinal = ordinal;
           values[ordinal] = this;
  
  
  
  1.2       +3 -3      incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InvocationType.java
  
  Index: InvocationType.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/java/org/apache/geronimo/remoting/InvocationType.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InvocationType.java	22 Aug 2003 02:23:26 -0000	1.1
  +++ InvocationType.java	23 Aug 2003 09:07:12 -0000	1.2
  @@ -71,8 +71,8 @@
       private final int ordinal;
   
       private InvocationType(String name, int ordinal) {
  -        assert(ordinal < MAX_ORIDNAL);
  -        assert(values[ordinal] == null);
  +        assert ordinal < MAX_ORIDNAL;
  +        assert values[ordinal] == null;
           this.name = name;
           this.ordinal = ordinal;
           values[ordinal] = this;
  
  
  

Mime
View raw message