Index: trunk/WEB-INF/src/com/showcase/sql/ShowCaseEmailDAOImpl.java =================================================================== diff -u -r242 -r243 --- trunk/WEB-INF/src/com/showcase/sql/ShowCaseEmailDAOImpl.java (.../ShowCaseEmailDAOImpl.java) (revision 242) +++ trunk/WEB-INF/src/com/showcase/sql/ShowCaseEmailDAOImpl.java (.../ShowCaseEmailDAOImpl.java) (revision 243) @@ -57,13 +57,17 @@ while(rs.next()) { if(rs.getString("region_code") != null) { RegionInfo regionInfo = regions.get(rs.getString("region_code")+"-"+rs.getString("manager_id")); - if( rs.getString("rep_id") != null) { - RepInfo repInfo = new RepInfo(); - repInfo.setId( rs.getString("rep_id")); - repInfo.setName(rs.getString("rep_name")); - repInfo.setEmail(rs.getString("email_address")); - regionInfo.addRep(repInfo); - } + if (regionInfo != null) { + if (rs.getString("rep_id") != null) { + RepInfo repInfo = new RepInfo(); + repInfo.setId(rs.getString("rep_id")); + repInfo.setName(rs.getString("rep_name")); + repInfo.setEmail(rs.getString("email_address")); + regionInfo.addRep(repInfo); + } + } else { + log.error("Email Errors: Missing Regions: " + rs.getString("region_code") + "-" + rs.getString("manager_id") ); + } } } @@ -73,27 +77,31 @@ while(rs.next()) { if(rs.getString("region_code") != null) { RegionInfo regionInfo = regions.get(rs.getString("region_code")+"-"+rs.getString("manager_id")); - if(rs.getString("rep_id") != null) { - RepInfo repInfo = regionInfo.getRepInfo(rs.getString("rep_id")); - String dealerId = rs.getString("dealer_id"); - if(dealerId != null) { - if("SisterSite".equals(rs.getString("title"))){ - Dealer dealer = repInfo.getSisterSite(dealerId); - if(dealer == null) { - dealer = getDealer(rs, preRegistration); - } - addAttendee(rs, dealer); - repInfo.addSisterSite(dealer); - } else { - Dealer dealer = repInfo.getAttendedDealer(dealerId); - if(dealer == null) { - dealer = getDealer(rs, preRegistration); - } - addAttendee(rs, dealer); - repInfo.addAttendedDealer(dealer); - } - } - } + if (regionInfo != null) { + if (rs.getString("rep_id") != null) { + RepInfo repInfo = regionInfo.getRepInfo(rs.getString("rep_id")); + String dealerId = rs.getString("dealer_id"); + if (dealerId != null) { + if ("SisterSite".equals(rs.getString("title"))) { + Dealer dealer = repInfo.getSisterSite(dealerId); + if (dealer == null) { + dealer = getDealer(rs, preRegistration); + } + addAttendee(rs, dealer); + repInfo.addSisterSite(dealer); + } else { + Dealer dealer = repInfo.getAttendedDealer(dealerId); + if (dealer == null) { + dealer = getDealer(rs, preRegistration); + } + addAttendee(rs, dealer); + repInfo.addAttendedDealer(dealer); + } + } + } + } else { + log.error("Email Errors: Missing Regions: " + rs.getString("region_code") + "-" + rs.getString("manager_id") ); + } } } } catch (SQLException sqlE) {