Merge branch 'master' of gitlab.codecrew.fi:codecrew/moya into devel

code/MoyaDatabase/src/fi/codecrew/moya/model/converters/JsonAttributeConverter.java

@@ -58,7 +58,9 @@ public class JsonAttributeConverter implements AttributeConverter<JsonObject, PG
 
 		// Read the value as JSON
 		String stringValue = pgObject.getValue();
-		if (stringValue != null) {
+		
+		// We must test for "null" because pgObject.getValues() seems to return "null" for null :)
+		if (stringValue != null && !stringValue.toLowerCase().equals("null")) {
 			JsonReader jsonReader = Json.createReader(new StringReader(stringValue));
 			JsonObject jsonObject = jsonReader.readObject();
 			log.info("Converted PGobject to JsonObject: {}", jsonObject);