BugID: 1050 - Modifiche Articolo 18 - Correzione anomalia Alfresco

consiglionazionaledellericerche · Apr 30, 2013 · bf1abfe · bf1abfe
1 parent d7077cb
commit bf1abfe
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/sigla-ejb/src/main/java/it/cnr/contab/incarichi00/bulk/cmis/CMISFileIncarichi.java b/sigla-ejb/src/main/java/it/cnr/contab/incarichi00/bulk/cmis/CMISFileIncarichi.java
@@ -66,19 +66,28 @@ public CMISFileIncarichi(File file, String originalName, Incarichi_repertorio_va
     public CMISFileIncarichi(Node node, Incarichi_repertorio_archivioBulk incaricoRepertorioArchivio) {
 		super(node);
     	setIncaricoArchivio(incaricoRepertorioArchivio);
-		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	if (node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value())!=null)
+    		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	else
+    		this.setOriginalName(incaricoRepertorioArchivio.getNome_file());
 	}
 
     public CMISFileIncarichi(Node node, Incarichi_repertorio_rappBulk incaricoRepertorioRapp) {
 		super(node);
 		setIncaricoArchivio(incaricoRepertorioRapp);
-		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	if (node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value())!=null)
+    		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	else
+    		this.setOriginalName(incaricoRepertorioRapp.getNome_file());
 	}
 
     public CMISFileIncarichi(Node node, Incarichi_repertorio_varBulk incaricoRepertorioVar) {
 		super(node);
 		setIncaricoArchivio(incaricoRepertorioVar);
-		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	if (node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value())!=null)
+    		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	else
+    		this.setOriginalName(incaricoRepertorioVar.getNome_file());
 	}
 
 	private void initCMISField(Integer esercizio, Long progressivo, String originalName){

diff --git a/sigla-ejb/src/main/java/it/cnr/contab/incarichi00/bulk/cmis/CMISFileProcedura.java b/sigla-ejb/src/main/java/it/cnr/contab/incarichi00/bulk/cmis/CMISFileProcedura.java
@@ -47,7 +47,10 @@ public CMISFileProcedura(File file, String originalName, Incarichi_procedura_arc
     public CMISFileProcedura(Node node, Incarichi_procedura_archivioBulk incaricoProceduraArchivio) {
 		super(node);
     	setIncaricoProceduraArchivio(incaricoProceduraArchivio);
-		this.setOriginalName((String)node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()));
+    	if (node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value())!=null)
+    		this.setOriginalName(node.getPropertyValue(CMISContrattiProperty.SIGLA_CONTRATTI_ATTACHMENT_ORIGINAL_NAME.value()).toString());
+    	else
+    		this.setOriginalName(incaricoProceduraArchivio.getNome_file());
 	}
 
     private void setIncaricoProceduraArchivio(Incarichi_procedura_archivioBulk incaricoProceduraArchivio) {