svn commit: [jahia] r17769 - /trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java

[tdraier]

Author: tdraier
Date: Mon Jun 25 15:48:18 2007
New Revision: 17769

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17769&repname=
=3Djahia
Log:
avoid npe (JAHIA-2075) ( backport 17676 )

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=3D/trunk/core/src/java/o=
rg/jahia/services/importexport/ImportHandler.java&rev=3D17769&repname=3Djah=
ia
=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
--- trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java =
(original)
+++ trunk/core/src/java/org/jahia/services/importexport/ImportHandler.java =
Mon Jun 25 15:48:18 2007
@@ -1686,18 +1686,20 @@
                     }
                 }
                 try {
-                    JahiaObjectManager jahiaObjectMgr =3D (JahiaObjectMana=
ger) SpringContextSingleton
-                            .getInstance().getContext().getBean(JahiaObjec=
tManager.class.getName());
-                    JahiaObjectDelegate jahiaObjectDelegate =3D jahiaObjec=
tMgr.getJahiaObjectDelegate(objectKey);
-                    timeBasedPublishingService.saveRetentionRule(rule);
-                    jahiaObjectDelegate.setRule(rule);
-                    jahiaObjectDelegate.setObjectKey(objectKey);
-                    jahiaObjectMgr.save(jahiaObjectDelegate);
-
-                    RetentionRuleEvent event =3D new RetentionRuleEvent(th=
is, jParams,
-                            rule.getId().intValue(),RetentionRuleEvent.UPD=
ATING_RULE,-1);
-                    ServicesRegistry.getInstance().getJahiaEventService().=
fireTimeBasedPublishingStateChange(event);
-                    rule.startJob();
+                    if (rule !=3D null) {
+                        JahiaObjectManager jahiaObjectMgr =3D (JahiaObject=
Manager) SpringContextSingleton
+                                .getInstance().getContext().getBean(JahiaO=
bjectManager.class.getName());
+                        JahiaObjectDelegate jahiaObjectDelegate =3D jahiaO=
bjectMgr.getJahiaObjectDelegate(objectKey);
+                        timeBasedPublishingService.saveRetentionRule(rule);
+                        jahiaObjectDelegate.setRule(rule);
+                        jahiaObjectDelegate.setObjectKey(objectKey);
+                        jahiaObjectMgr.save(jahiaObjectDelegate);
+
+                        RetentionRuleEvent event =3D new RetentionRuleEven=
t(this, jParams,
+                                rule.getId().intValue(),RetentionRuleEvent=
.UPDATING_RULE,-1);
+                        ServicesRegistry.getInstance().getJahiaEventServic=
e().fireTimeBasedPublishingStateChange(event);
+                        rule.startJob();
+                    }
                 } catch (Exception e) {
                     // [EMAIL PROTECTED]
                     logger.error("Cannot set retention rule",e);

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list