Project

General

Profile

« Previous | Next » 

Revision 0504b50c

Added by Andreas Müller about 5 years ago

ref #8062 fix NPE in TaxonGraphTest

View differences:

cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/PreferenceDaoImpl.java
59 59 
		IPreferencePredicate<?> predicate = PreferencePredicate.getByKey(preference.getPredicate());
60 60 
		if (predicate == null ||
61 61 
		        !preference.isAllowOverride() ||
62 
		        !CdmUtils.nullSafeEqual(predicate.getDefaultValue().toString(), preference.getValue())){
62 
		        !CdmUtils.nullSafeEqual(nullOrToString(predicate.getDefaultValue()), preference.getValue())){
63 63 
		    //do not save is value is default value with allow override
64 64 
		    getSession().save(preference);
65 65 
		}
......
72 72 
//		}
73 73 
	}
74 74 

  		




  
  75
  
    
    /**


  		




  
  76
  
    
     * Return null if obj is null, obj.toString otherwise


  		




  
  77
  
    
     * @param defaultValue


  		




  
  78
  
    
     * @return


  		




  
  79
  
    
     */


  		




  
  80
  
    
    private Object nullOrToString(Object obj) {


  		




  
  81
  
    
        return obj == null? null: obj.toString();


  		




  
  82
  
    
    }


  		




  
  83
  
    

  		




  75
  84
  
    
    @Override


  		




  76
  85
  
    
    public List<CdmPreference> list(IPreferencePredicate<?> predicate){


  		




  77
  86
  
    

  		












Also available in:  Unified diff