Changeset 5391

Timestamp:

Aug 18, 2010, 11:55:17 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #1498: Investigate and fix issues found by FindBugs?

Reverted a change made in [5384] since it caused the taglib to store and use old DbControl:s.

File:

• trunk/src/clients/web/net/sf/basedb/clients/web/taglib/PropertyValue.java (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/taglib/PropertyValue.java

@@ -177 +177 @@
     if (dc == null && item instanceof BasicItem)
     {
-      dc = ((BasicItem)item).getDbControl();
+      return ((BasicItem)item).getDbControl();
     }
     return dc;
@@ -269 +269 @@
     {
       Object item = getItem();
-      Object value = null;      
-      String ID = getDbcontrol().getSessionControl().getId();     
+      Object value = null;  
+      DbControl dc = getDbcontrol();
+      String ID = dc.getSessionControl().getId();     
       
       if (item != null)
       {
         PropertyPath propertyPath = getPropertyPath(item, getProperty());
-        value = propertyPath.getValue(getDbcontrol(), item);
+        value = propertyPath.getValue(dc, item);
       }
       if (value instanceof Removable)