[mb-commits] r13701 - search_server/trunk/index/src/main/java/org/musicbrainz/search/index

Author: ijabz
Date: 2013-07-27 11:16:53 +0000 (Sat, 27 Jul 2013)
New Revision: 13701

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
Log:
Check for when release not available

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-06-07 13:06:55 UTC (rev 13700)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-07-27 11:16:53 UTC (rev 13701)
@@ -587,28 +587,29 @@
         while (rs.next()) {
             int releaseKey = rs.getInt("release");
             release = releases.get(releaseKey);
-            if (release.getReleaseEventList() == null) {
-                release.setReleaseEventList(of.createReleaseEventList());
+            if(release!=null) {
+                if (release.getReleaseEventList() == null) {
+                    release.setReleaseEventList(of.createReleaseEventList());
+                }
+                ReleaseEvent re = of.createReleaseEvent();
+                re.setDate(Strings.emptyToNull(Utils.formatDate(rs.getInt("date_year"), rs.getInt("date_month"), rs.getInt("date_day"))));
+                String iso_code=rs.getString("country");
+                String gid       = rs.getString("gid");
+                String name      = rs.getString("name");
+                String sort_name = rs.getString("sort_name");
+                if(iso_code!=null) {
+                    Iso31661CodeList isoList = of.createIso31661CodeList();
+                    isoList.getIso31661Code().add(iso_code);
+                    DefAreaElementInner area = of.createDefAreaElementInner();
+                    area.setIso31661CodeList(isoList);
+                    re.setArea(area);
+                    area.setId(gid);
+                    area.setName(name);
+                    area.setSortName(sort_name);
+                }
+                release.getReleaseEventList().getReleaseEvent().add(re);
             }
-            ReleaseEvent re = of.createReleaseEvent();
-            re.setDate(Strings.emptyToNull(Utils.formatDate(rs.getInt("date_year"), rs.getInt("date_month"), rs.getInt("date_day"))));
-            String iso_code=rs.getString("country");
-            String gid       = rs.getString("gid");
-            String name      = rs.getString("name");
-            String sort_name = rs.getString("sort_name");
-            if(iso_code!=null) {
-                Iso31661CodeList isoList = of.createIso31661CodeList();
-                isoList.getIso31661Code().add(iso_code);
-                DefAreaElementInner area = of.createDefAreaElementInner();
-                area.setIso31661CodeList(isoList);
-                re.setArea(area);
-                area.setId(gid);
-                area.setName(name);
-                area.setSortName(sort_name);
-            }
-            release.getReleaseEventList().getReleaseEvent().add(re);
         }
-
         //Add secondary types of the releasegroup that each release is part of
         stmt = createReleaseSecondaryTypesStatement(releaseKeys.size());
         count = 1;