Scarab commit: svn commit: r10544 - trunk/src/java/org/tigris/scarab/reports/ReportBridge.java

Author: ronvoe122
Date: 2008-04-15 13:54:24-0700
New Revision: 10544

Modified:
   trunk/src/java/org/tigris/scarab/reports/ReportBridge.java

Log:
SCB2526: chained attribute values were not properly initialized with an issue in ReportBridge.populateSearch.
This caused a NPE when creating a report with multiple options of the same attribute.

Modified: trunk/src/java/org/tigris/scarab/reports/ReportBridge.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/reports/ReportBridge.java?view=diff&rev=10544&p1=trunk/src/java/org/tigris/scarab/reports/ReportBridge.java&p2=trunk/src/java/org/tigris/scarab/reports/ReportBridge.java&r1=10543&r2=10544
==============================================================================
--- trunk/src/java/org/tigris/scarab/reports/ReportBridge.java	(original)
+++ trunk/src/java/org/tigris/scarab/reports/ReportBridge.java	2008-04-15 13:54:24-0700
@@ -729,14 +729,15 @@
 
                 Integer attId = AttributeOptionManager.getInstance(optionId).getAttributeId();
                 Attribute attr = AttributeManager.getInstance(attId); 
-                if (commonAttributeMap.containsKey(attId)) 
+
+                AttributeValue prevAV = 
+                    (AttributeValue)commonAttributeMap.get(attId);
+
+                if(prevAV!=null) 
                 {
-                    //FIXME is null as Issue really ok?
                 	AttributeValue av = AttributeValue
-                    .getNewInstance(attr, null);
+                    .getNewInstance(attr, prevAV.getIssue());
                     av.setAttributeOption(ao);
-                    AttributeValue prevAV = 
-                        (AttributeValue)commonAttributeMap.get(attId);
                     prevAV.setChainedValue(av);
                 }
                 else