[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo/impl ...

[Ben Wang]

  User: bwang   
  Date: 06/07/17 05:58:08

  Modified:    src-50/org/jboss/cache/pojo/impl   AdvisedPojoHandler.java
                        PojoCacheDelegate.java
  Log:
  getObject should allow null as well.
  
  Revision  Changes    Path
  1.6       +2 -1      JBossCache/src-50/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AdvisedPojoHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/AdvisedPojoHandler.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- AdvisedPojoHandler.java	17 Jul 2006 09:07:08 -0000	1.5
  +++ AdvisedPojoHandler.java	17 Jul 2006 09:58:07 -0000	1.6
  @@ -40,7 +40,7 @@
    *
    * @author Ben Wang
    *         Date: Aug 4, 2005
  - * @version $Id: AdvisedPojoHandler.java,v 1.5 2006/07/17 09:07:08 bwang Exp $
  + * @version $Id: AdvisedPojoHandler.java,v 1.6 2006/07/17 09:58:07 bwang Exp $
    */
   class AdvisedPojoHandler
   {
  @@ -159,6 +159,7 @@
         {
            Field field = (Field) o;
            Object value = subPojoMap.get(field);
  +         if(value == null) continue; // really no need to map the POJO.
            Fqn tmpFqn = new Fqn(fqn, field.getName());
            pCache_.putObject(tmpFqn, value);
            // If it is Collection classes, we replace it with dynamic proxy.
  
  
  
  1.8       +1 -2      JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheDelegate.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PojoCacheDelegate.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/impl/PojoCacheDelegate.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PojoCacheDelegate.java	17 Jul 2006 09:25:01 -0000	1.7
  +++ PojoCacheDelegate.java	17 Jul 2006 09:58:07 -0000	1.8
  @@ -221,8 +221,7 @@
         Object result = pCache_.getObject(internalFqn);
         if (result == null)
         {
  -         throw new IllegalStateException("PojoCacheDelegate.removeObject(): fqn: "
  -                 +fqn + " has null pojo.");
  +         return null;
         }
   
         if(graphHandler_.isMultipleReferenced(internalFqn))