Changeset 7023


Ignore:
Timestamp:
Nov 24, 2015, 12:56:29 PM (7 years ago)
Author:
Nicklas Nordborg
Message:

Fixes #1971: NullPointerException? when selecting a list preset

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3.6-stable/src/core/net/sf/basedb/core/ItemContext.java

    r6965 r7023  
    14131413  public void copyObjectsAndTemporaryFilters(ItemContext other)
    14141414  {
    1415     if (objects != null || objects.size() > 0)
     1415    if (objects != null && objects.size() > 0)
    14161416    {
    14171417      if (other.objects == null) other.objects = new HashMap<String, Object>();
    14181418      other.objects.putAll(objects);
    14191419    }
    1420     for (PropertyFilterPair filter : propertyFilters.values())
    1421     {
    1422       if (filter.temporary != null)
    1423       {
    1424         other.setPropertyFilter(filter.temporary);
     1420    if (propertyFilters != null && propertyFilters.size() > 0)
     1421    {
     1422      for (PropertyFilterPair filter : propertyFilters.values())
     1423      {
     1424        if (filter.temporary != null)
     1425        {
     1426          other.setPropertyFilter(filter.temporary);
     1427        }
    14251428      }
    14261429    }
Note: See TracChangeset for help on using the changeset viewer.