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

Author: ijabz
Date: 2014-04-24 10:07:04 +0000 (Thu, 24 Apr 2014)
New Revision: 13731

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java
Log:
SEARCH-348:Fixed timing problem.

Modified: search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java
===================================================================
--- search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java	2014-04-24 09:43:14 UTC (rev 13730)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/ArtistCreditHelper.java	2014-04-24 10:07:04 UTC (rev 13731)
@@ -153,6 +153,13 @@
             if(currEntityId!=entityId || currPosition!=position)
             {
                 ArtistCreditWrapper acw = artistCredits.get(currEntityId);
+                //SEARCH-348
+                //Timing problem new entity added since artistcredit query so artist credit cant be found for alias,
+                //ignore and move onto next entry
+                if(acw==null)
+                {
+                    continue;
+                }
                 nc = acw.getArtistCredit().getNameCredit().get(currPosition);
                 entityId = currEntityId;
                 position = currPosition;