Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== diff -u -r8a77a3094fce833b9f06e8d96c6626cbf55478ae -r048e104556a83cecd36e61258c9b700d406e6fdf --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 8a77a3094fce833b9f06e8d96c6626cbf55478ae) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 048e104556a83cecd36e61258c9b700d406e6fdf) @@ -417,7 +417,7 @@ Hashtable groupingDetails = (Hashtable)iterator.next(); if( groupingDetails != null ) { - Grouping grouping = extractGroupingObject(groupingDetails); + Grouping grouping = extractGroupingObject(groupingDetails); groupingDAO.insertOrUpdate(grouping); groupings.put(grouping.getGroupingUIID(),grouping); } @@ -443,15 +443,14 @@ if ( grouping != null && ! grouping.getGroupingTypeId().equals(groupingTypeID) ) { groupings.remove(grouping.getGroupingUIID()); groupingsToDelete.add(grouping); - grouping = null; + + grouping = null; } if (grouping == null) { Object object = Grouping.getGroupingInstance(groupingTypeID); grouping = (Grouping)object; - if(keyExists(groupingDetails, WDDXTAGS.GROUPING_ID)) - grouping.setGroupingId(WDDXProcessor.convertToLong(groupingDetails,WDDXTAGS.GROUPING_ID)); if (keyExists(groupingDetails, WDDXTAGS.GROUPING_UIID)) grouping.setGroupingUIID(WDDXProcessor.convertToInteger(groupingDetails,WDDXTAGS.GROUPING_UIID)); }