[openejb-scm] openejb/modules/core/src/java/org/openejb/entity/cmp CacheFiller.java

[gdamour]

gdamour     2005/09/12 07:33:57

  Modified:    modules/core/src/java/org/openejb/entity/cmp
                        CacheFiller.java
  Log:

  id may be null. For instance, this happens when a finder returns a null 
entity.
  
  Revision  Changes    Path
  1.2       +2 -2      
openejb/modules/core/src/java/org/openejb/entity/cmp/CacheFiller.java
  
  Index: CacheFiller.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/java/org/openejb/entity/cmp/CacheFiller.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CacheFiller.java  5 Aug 2005 10:52:09 -0000       1.1
  +++ CacheFiller.java  12 Sep 2005 11:33:57 -0000      1.2
  @@ -78,7 +78,7 @@
       public Object fetched(Row row, Object arg) throws QueryException {
           try {
               GlobalIdentity id = idDefiner.defineIdentity(row);
  -            if (null == cache.get(id)) {
  +            if (null != id && null == cache.get(id)) {
                   CacheRow cacheRow = id.getTable().emptyRow(id);
                   idInjector.injectIdentity(cacheRow);
                   cache.add(cacheRow);