Skip to content

#3141 Fix for null value in JSON #3142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scolapasta merged 1 commit into from
May 25, 2016
Merged

#3141 Fix for null value in JSON #3142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/edu/harvard/iq/dataverse/api/WorldMapRelatedData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down