[mb-commits] r13686 - in search_server/trunk/index/src: main/java/org/musicbrainz/search/index test/java/org/musicbrainz/search/index

Author: ijabz
Date: 2013-05-16 09:29:38 +0000 (Thu, 16 May 2013)
New Revision: 13686

Modified:
   search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java
   search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
Log:
SEARCH-290:Fixed with the bug present the behaviour was that whenever there was track artist credit that was different to the recording artist credit then it would in fact output the recording artist credit as the track artist credit.

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-05-10 13:14:08 UTC (rev 13685)
+++ search_server/trunk/index/src/main/java/org/musicbrainz/search/index/RecordingIndex.java	2013-05-16 09:29:38 UTC (rev 13686)
@@ -867,7 +867,7 @@
                                         RecordingIndexField.ARTIST_NAMECREDIT,
                                         RecordingIndexField.ARTIST_ID,
                                         RecordingIndexField.ARTIST_NAME);
-                        track.setArtistCredit(ac.getArtistCredit());
+                        track.setArtistCredit(taw.getArtistCredit());
                     }
                 }
             }

Modified: search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java
===================================================================
--- search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java	2013-05-10 13:14:08 UTC (rev 13685)
+++ search_server/trunk/index/src/test/java/org/musicbrainz/search/index/RecordingIndexTest.java	2013-05-16 09:29:38 UTC (rev 13686)
@@ -575,7 +575,7 @@
 
             ac = recording.getReleaseList().getRelease().get(0).getMediumList().getMedium().get(0).getTrackList().getDefTrack().get(0).getArtistCredit();
             assertNotNull(ac);
-            assertEquals("Echo & The Bunnymen", ac.getNameCredit().get(0).getArtist().getName());
+            assertEquals("Pixies", ac.getNameCredit().get(0).getArtist().getName());
         }
         ir.close();
     }