Author: tdraier
Date: Wed Aug  2 14:14:50 2006
New Revision: 14825

URL: https://svndev.jahia.net/websvn/listing.php?sc=1&rev=14825&repname=jahia
Log:
do not import if expression is invalid

Modified:
    trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java

Modified: trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java
URL: 
https://svndev.jahia.net/websvn/diff.php?path=/trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java&rev=14825&repname=jahia
==============================================================================
--- trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java 
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java Wed 
Aug  2 14:14:50 2006
@@ -1071,7 +1071,10 @@
             field.setValue(value);
             field.setObject(value);
         } else {
-            field.setValue(value);
+            ExpressionMarker exprMarker = 
ExpressionMarker.parseMarkerValue(value, jParams);
+            if (exprMarker.getValue() != null) {
+                field.setValue(value);
+            }
         }
     }
 

Reply via email to