Commit 57d13e67 authored by Matija Obreza's avatar Matija Obreza

Merge branch 'master' into rest

parents 5296f24d a73d7a58
......@@ -35,7 +35,6 @@ import org.hibernate.search.annotations.Store;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
@Entity
@Table(name = "country")
......@@ -145,7 +144,8 @@ public class Country extends BusinessModel {
ObjectMapper mapper = new ObjectMapper();
try {
this.nameJ = mapper.readTree(nameL);
ObjectNode newLang = mapper.createObjectNode().put(locale.getLanguage(), name);
// ObjectNode newLang =
// mapper.createObjectNode().put(locale.getLanguage(), name);
// System.err.println(newLang);
} catch (IOException e) {
}
......
......@@ -101,4 +101,4 @@
<page-encoding>UTF-8</page-encoding>
</jsp-property-group>
</jsp-config>
</web-app>
\ No newline at end of file
</web-app>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment