db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@apache.org
Subject cvs commit: db-ojb/src/java/org/apache/ojb/broker/util BrokerHelper.java ReferenceMap.java
Date Sat, 27 Mar 2004 18:19:05 GMT
brj         2004/03/27 10:19:05

  Modified:    src/java/org/apache/ojb/broker/util BrokerHelper.java
                        ReferenceMap.java
  Log:
  minor refactorings
  
  Revision  Changes    Path
  1.43      +1 -3      db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java
  
  Index: BrokerHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- BrokerHelper.java	26 Mar 2004 21:31:56 -0000	1.42
  +++ BrokerHelper.java	27 Mar 2004 18:19:05 -0000	1.43
  @@ -24,7 +24,6 @@
   import java.util.WeakHashMap;
   
   import org.apache.ojb.broker.Identity;
  -import org.apache.ojb.broker.OJBRuntimeException;
   import org.apache.ojb.broker.PBKey;
   import org.apache.ojb.broker.PersistenceBrokerException;
   import org.apache.ojb.broker.PersistenceBrokerSQLException;
  @@ -40,7 +39,6 @@
   import org.apache.ojb.broker.metadata.MetadataException;
   import org.apache.ojb.broker.metadata.MetadataManager;
   import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor;
  -import org.apache.ojb.broker.metadata.RepositoryTags;
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
   import org.apache.ojb.broker.platforms.Platform;
   import org.apache.ojb.broker.query.Criteria;
  
  
  
  1.3       +6 -6      db-ojb/src/java/org/apache/ojb/broker/util/ReferenceMap.java
  
  Index: ReferenceMap.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ReferenceMap.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ReferenceMap.java	11 Mar 2004 18:16:14 -0000	1.2
  +++ ReferenceMap.java	27 Mar 2004 18:19:05 -0000	1.3
  @@ -799,11 +799,11 @@
               if (!(o instanceof Map.Entry)) return false;
   
               Map.Entry entry = (Map.Entry) o;
  -            Object key = entry.getKey();
  -            Object value = entry.getValue();
  -            if ((key == null) || (value == null)) return false;
  -            return ReferenceMap.this.equals(key, getKey()) &&
  -                    ReferenceMap.this.equals(value, getValue());
  +            Object _key = entry.getKey();
  +            Object _value = entry.getValue();
  +            if ((_key == null) || (_value == null)) return false;
  +            return ReferenceMap.this.equals(_key, getKey()) &&
  +                    ReferenceMap.this.equals(_value, getValue());
           }
   
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message