Merge pull request thinkgem#341 from zzguiji/master

may throw null point exception
farkguidao · Dec 31, 2016 · 8fcdf70 · 8fcdf70
2 parents 604d091 + 70c5b8e
commit 8fcdf70
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/com/thinkgem/jeesite/modules/act/service/ActProcessService.java b/src/main/java/com/thinkgem/jeesite/modules/act/service/ActProcessService.java
@@ -138,7 +138,7 @@ public String deploy(String exportDir, String category, MultipartFile file) {
 
 		try {
 			InputStream fileInputStream = file.getInputStream();
-			Deployment deployment = null;
+			Deployment deployment;
 			String extension = FilenameUtils.getExtension(fileName);
 			if (extension.equals("zip") || extension.equals("bar")) {
 				ZipInputStream zip = new ZipInputStream(fileInputStream);
@@ -152,6 +152,7 @@ public String deploy(String exportDir, String category, MultipartFile file) {
 				deployment = repositoryService.createDeployment().addInputStream(baseName + ".bpmn20.xml", fileInputStream).deploy();
 			} else {
 				message = "不支持的文件类型：" + extension;
+				return message;
 			}
 
 			List<ProcessDefinition> list = repositoryService.createProcessDefinitionQuery().deploymentId(deployment.getId()).list();