[mb-commits] r13688 - search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1

Author: ijabz
Date: 2013-05-20 10:46:39 +0000 (Mon, 20 May 2013)
New Revision: 13688

Modified:
   search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java
Log:
SEARCH-298:ws/1 release search output broken for releases with no labels

Modified: search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java
===================================================================
--- search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java	2013-05-20 09:23:17 UTC (rev 13687)
+++ search_server/trunk/servlet/src/main/java/org/musicbrainz/search/servlet/mmd1/ReleaseMmd1XmlWriter.java	2013-05-20 10:46:39 UTC (rev 13688)
@@ -89,7 +89,7 @@
 
             TextRepresentation tr = of.createTextRepresentation();
             org.musicbrainz.mmd2.TextRepresentation tr2 = releasev2.getTextRepresentation();
-            if (tr != null) {
+            if (tr2 != null) {
                 if (!Strings.isNullOrEmpty(tr2.getScript())) {
                     tr.setScript(tr2.getScript());
                 }
@@ -119,7 +119,7 @@
             //Just use format of first medium
             Medium firstMediumv2 = releasev2.getMediumList().getMedium().get(0);
             LabelInfoList lilv2 = releasev2.getLabelInfoList();
-            if (!lilv2.getLabelInfo().isEmpty()) {
+            if (lilv2!=null && !lilv2.getLabelInfo().isEmpty()) {
                 ReleaseEventList eventList = of.createReleaseEventList();
                 for (LabelInfo liv2 : lilv2.getLabelInfo()) {
                     Event event = of.createEvent();