Merge branch 'develop' into 2579-DDI-export

Author: sekmiller

src/main/java/edu/harvard/iq/dataverse/api/WorldMapRelatedData.java

@@ -616,7 +616,7 @@ public Response updateWorldMapLayerData(String jsonLayerData){
         //  - isJoinLayer
         //  - joinDescription
         //
-        String joinDescription = jsonInfo.getString("joinDescription");
+        String joinDescription = jsonInfo.getString("joinDescription", null);
         if ((joinDescription == null) || (joinDescription.equals(""))){
             mapLayerMetadata.setIsJoinLayer(true);
             mapLayerMetadata.setJoinDescription(joinDescription);
@@ -627,8 +627,8 @@ public Response updateWorldMapLayerData(String jsonLayerData){
 
         // Set the mapLayerLinks 
         //
-        String mapLayerLinks = jsonInfo.getString("mapLayerLinks");
-        if (mapLayerLinks == null){
+        String mapLayerLinks = jsonInfo.getString("mapLayerLinks", null);
+        if ((mapLayerLinks == null) || (mapLayerLinks.equals(""))){
             mapLayerMetadata.setMapLayerLinks(null);                        
         }else{
             mapLayerMetadata.setMapLayerLinks(mapLayerLinks);