Author: tdraier
Date: Tue Aug 28 18:27:11 2007
New Revision: 18287
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18287&repname=
=3Djahia
Log:
don't crash when importing empty files , log error
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportHandler.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources.properties&rev=3D18287&rep=
name=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources.p=
roperties Tue Aug 28 18:27:11 2007
@@ -1515,6 +1515,7 @@
org.jahia.engines.importexport.import.template =3D Template not found for =
object {0} : {1} ({2}, line {3})
org.jahia.engines.importexport.import.templateCompilation =3D Template {0}=
does not compile
org.jahia.engines.importexport.import.fileerror =3D Error when importing f=
ile
+org.jahia.engines.importexport.import.empty =3D Import file {0} empty
org.jahia.engines.importexport.import.error =3D Error when importing objec=
t {0} ({1}) : {2} ({3}, line {4})
org.jahia.engines.importexport.import.definition =3D Definition not found =
for object {0} ({1}), in {2} (template {3}) ({4}, line {5})
org.jahia.engines.importexport.import.definitionInCtn =3D Definition not f=
ound for object {0} ({1}), in {2} (container {4} in template {3}) ({5}, lin=
e {6})
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_en.properties&rev=3D18287&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_e=
n.properties Tue Aug 28 18:27:11 2007
@@ -1515,6 +1515,7 @@
org.jahia.engines.importexport.import.template =3D Template not found for =
object {0} : {1} ({2}, line {3})
org.jahia.engines.importexport.import.templateCompilation =3D Template {0}=
does not compile
org.jahia.engines.importexport.import.fileerror =3D Error when importing f=
ile
+org.jahia.engines.importexport.import.empty =3D Import file {0} empty
org.jahia.engines.importexport.import.error =3D Error when importing objec=
t {0} ({1}) : {2} ({3}, line {4})
org.jahia.engines.importexport.import.definition =3D Definition not found =
for object {0} ({1}), in {2} (template {3}) ({4}, line {5})
org.jahia.engines.importexport.import.definitionInCtn =3D Definition not f=
ound for object {0} ({1}), in {2} (container {4} in template {3}) ({5}, lin=
e {6})
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResou=
rces_fr.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/conf/java/JahiaEnginesResources_fr.properties&rev=3D18287&=
repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/conf/java/JahiaEnginesResources_f=
r.properties Tue Aug 28 18:27:11 2007
@@ -451,7 +451,8 @@
org.jahia.engines.importexport.import.definition =3D D=C3=A9finition non t=
rouv=C3=A9e pour l''objet {0} ({1}), in {2} (template {3}) ({4}, ligne {5})
org.jahia.engines.importexport.import.definitionInCtn =3D D=C3=A9finition =
non trouv=C3=A9e pour l''objet {0} ({1}), in {2} (container {4} dans la tem=
plate {3}) ({5}, ligne {6})
org.jahia.engines.importexport.import.error =3D Erreur lors de l''import d=
e l''objet {0} ({1}) : {2} ({3}, ligne {4})
-org.jahia.engines.importexport.import.fileerror =3D Erreur lors de l'impor=
t du fichier
+org.jahia.engines.importexport.import.fileerror =3D Erreur lors de l''impo=
rt du fichier
+org.jahia.engines.importexport.import.empty =3D Fichier d''import {0} vide
org.jahia.engines.importexport.import.linkNotFound =3D Le lien {0} dans la=
page {1} n a pas =C3=A9t=C3=A9 trouv=C3=A9 dans l''import - ({2}, ligne {3=
})
org.jahia.engines.importexport.import.linkNotFoundInBigText =3D Le lien {0=
} dans le bigtext {1} sur la page {2} n''a pas =C3=A9t=C3=A9 trouv=C3=A9 da=
ns l''import - ({3}, ligne {4})
org.jahia.engines.importexport.import.notimported =3D Objet {0} ({1}) non =
import=C3=A9 ({2}, ligne {3})
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/imp=
ortexport/ImportHandler.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/importexport/ImportHandler.java&re=
v=3D18287&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportHandler.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/importexp=
ort/ImportHandler.java Tue Aug 28 18:27:11 2007
@@ -341,6 +341,13 @@
=
int op =3D VersioningDifferenceStatus.ADDED;
=
+ if (localName.equals("empty") && namespaceURI.equals(ImportExportB=
aseService.JAHIA_URI)) {
+ result.setStatus(TreeOperationResult.FAILED_OPERATION_STATUS);
+ final EngineMessage msg =3D new EngineMessage("org.jahia.engin=
es.importexport.import.empty", new Object[] {language});
+ result.appendError(new NodeImportResult(null, language, msg, l=
ocalName, namespaceURI, qName, atts, null));
+ objects.push(null);
+ return;
+ }
try {
String uuid =3D atts.getValue(ImportExportBaseService.JCR_URI,=
"uuid");
String diff =3D atts.getValue(ImportExportBaseService.JAHIA_UR=
I, "diff");
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
