Author: tdraier
Date: Wed Jun 20 17:15:52 2007
New Revision: 17676
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17676&repname=
=3Djahia
Log:
avoid npe (JAHIA-2075)
Modified:
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/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=3D17676&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 Wed Jun 20 17:15:52 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
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
