zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix npe.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2013-02-13 22:51:55 -03:00
parent 28ffead0a0
commit deca7e51b2
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
View File

@@ -120,7 +120,7 @@ public class MindmapController extends BaseController {
@RequestMapping(value = "maps/{id}/history/{hid}", method = RequestMethod.POST)
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void updateRevertMindmap(@PathVariable int id, @PathVariable String hid) throws WiseMappingException {
public void updateRevertMindmap(@PathVariable int id, @PathVariable String hid) throws WiseMappingException, IOException {
final Mindmap mindmap = mindmapService.findMindmapById(id);
final User user = Utils.getUser();
@@ -129,7 +129,7 @@ public class MindmapController extends BaseController {
List<MindMapHistory> mindmapHistory = mindmapService.findMindmapHistory(id);
if (mindmapHistory.size() > 0) {
final MindMapHistory mindMapHistory = mindmapHistory.get(0);
mindmap.setXml(mindMapHistory.getXml());
mindmap.setZippedXml(mindMapHistory.getXml());
saveMindmapDocument(true, mindmap, user);
}
} else {
@@ -188,7 +188,7 @@ public class MindmapController extends BaseController {
// I should not return byte, but there is some encoding issue here. Further research needed.
response.setCharacterEncoding("UTF-8");
final MindMapHistory mindmapHistory = mindmapService.findMindmapHistory(id, hid);
return mindmapHistory.getXml();
return mindmapHistory.getUnzipXml();
}