tdraier 2005/09/30 10:49:44 CEST
Modified files:
core/src/java/org/jahia/services/importexport
ContentPickerListener.java
Log:
avoid npe
Revision Changes Path
1.13 +21 -19
jahia/core/src/java/org/jahia/services/importexport/ContentPickerListener.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/importexport/ContentPickerListener.java.diff?r1=1.12&r2=1.13&f=h
Index: ContentPickerListener.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/importexport/ContentPickerListener.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ContentPickerListener.java 29 Sep 2005 15:17:30 -0000 1.12
+++ ContentPickerListener.java 30 Sep 2005 08:49:44 -0000 1.13
@@ -181,30 +181,32 @@
Set pickers = source.getPickerObjects();
for (Iterator iterator = pickers.iterator();
iterator.hasNext();) {
ContentObject picker = (ContentObject) iterator.next();
- ProcessingContext jParams = Jahia.getThreadParamBean();
+ if (picker != null) {
+ ProcessingContext jParams = Jahia.getThreadParamBean();
- String language = jParams.getCurrentLocale().toString();
+ String language = jParams.getCurrentLocale().toString();
- Set curLanguageCodes = new HashSet();
- if (picker instanceof ContentContainer) {
- ContentContainer contentContainer = (ContentContainer)
picker;
- curLanguageCodes.add(ContentObject.SHARED_LANGUAGE);
+ Set curLanguageCodes = new HashSet();
+ if (picker instanceof ContentContainer) {
+ ContentContainer contentContainer =
(ContentContainer) picker;
+ curLanguageCodes.add(ContentObject.SHARED_LANGUAGE);
- StateModificationContext stateModifContext =
- new
StateModificationContext(picker.getObjectKey(), curLanguageCodes, true);
- stateModifContext.pushAllLanguages(true);
+ StateModificationContext stateModifContext =
+ new
StateModificationContext(picker.getObjectKey(), curLanguageCodes, true);
+ stateModifContext.pushAllLanguages(true);
- contentContainer.markLanguageForDeletion(
- jParams.getUser(),
- ContentObject.SHARED_LANGUAGE,
- stateModifContext);
+ contentContainer.markLanguageForDeletion(
+ jParams.getUser(),
+ ContentObject.SHARED_LANGUAGE,
+ stateModifContext);
- } else {
- curLanguageCodes.add(language);
- curLanguageCodes.add(ContentObject.SHARED_LANGUAGE);
- StateModificationContext stateModifContext =
- new
StateModificationContext(picker.getObjectKey(), curLanguageCodes, true);
- picker.markLanguageForDeletion(jParams.getUser(),
language, stateModifContext);
+ } else {
+ curLanguageCodes.add(language);
+ curLanguageCodes.add(ContentObject.SHARED_LANGUAGE);
+ StateModificationContext stateModifContext =
+ new
StateModificationContext(picker.getObjectKey(), curLanguageCodes, true);
+ picker.markLanguageForDeletion(jParams.getUser(),
language, stateModifContext);
+ }
}
}
} catch (JahiaException e) {
