Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java,v diff -u -r1.36 -r1.37 --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java 14 Dec 2006 22:59:18 -0000 1.36 +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java 8 May 2007 04:40:42 -0000 1.37 @@ -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)); }