Changeset 6930

Timestamp:

Jun 10, 2015, 11:41:55 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1949: NullPointerException? when merging item lists

The problem was that the current context is used to store some temporary information while editing items (eg. the current item list). When selecting a saved preset, it replaces the current context and also all temporary objects stored in it, thereby causing the NullPointerException when trying to use it later. All list pages are potentially affected by the same problem.

The fix is to copy temporary objects from the current context to the preset when it is loaded.

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/Base.java (modified) (1 diff)
• core/net/sf/basedb/core/ItemContext.java (modified) (1 diff)
• core/net/sf/basedb/core/SessionControl.java (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -806 +806 @@
   public static ItemContext loadContext(SessionControl sc, int contextId, ItemContext defaultContext)
   {
-    ItemContext cc = sc.loadContext(contextId);
+    ItemContext cc = sc.loadContext(contextId, true);
     // Copy default columns so it is always available in other contexts
     if (defaultContext != null && cc != null)

trunk/src/core/net/sf/basedb/core/ItemContext.java

@@ -1404 +1404 @@
   {
     return objects == null ? null : objects.remove(name);
+  }
+  
+  /**
+    Copies all objects and temporary filters from this context
+    to another context.
+    @since 3.6
+  */
+  public void copyObjectsAndTemporaryFilters(ItemContext other)
+  {
+    if (objects != null || objects.size() > 0)
+    {
+      if (other.objects == null) other.objects = new HashMap<String, Object>();
+      other.objects.putAll(objects);
+    }
+    for (PropertyFilterPair filter : propertyFilters.values())
+    {
+      if (filter.temporary != null)
+      {
+        other.setPropertyFilter(filter.temporary);
+      }
+    }
   }
 

trunk/src/core/net/sf/basedb/core/SessionControl.java

@@ -1381 +1381 @@
     throws NotLoggedInException, BaseException
   {
+    return loadContext(contextId, false);
+  }
+  
+  /**
+    Load a context and make it the current context, optionally copying 
+    temporary filters and objects from the current context to the loaded context.
+    If a saved context with the specified ID
+    doesn't exists, or if the logged in user does't have permission to read it,
+    null is returned and the current context is left unchanged.
+    
+    @param contextId The ID of the context to load
+    @return An <code>ItemContext</code> object or null
+    @throws NotLoggedInException If no user is logged in
+    @throws BaseException If there is another error
+    @see #saveCurrentContextAs(Item, String, boolean, boolean)
+    @see #getContextNames(Item)
+    @since 3.6
+  */
+  public ItemContext loadContext(int contextId, boolean copyTemporaryObjects)
+    throws NotLoggedInException, BaseException
+  {
     updateLastAccess();
     if (!isLoggedIn())
@@ -1390 +1411 @@
     {
       ContextKey contextKey = new ContextKey(context.getItemType(), context.getSubContext());
-      currentContexts.put(contextKey, context);
+      ItemContext old = currentContexts.put(contextKey, context);
+      if (copyTemporaryObjects && old != null)
+      {
+        old.copyObjectsAndTemporaryFilters(context);
+      }
     }
     return context;
   }
+
   
   /**