Author: tdraier
Date: Thu Aug 2 16:15:06 2007
New Revision: 18107
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18107&repname=
=3Djahia
Log:
avoid npe (port 18051)
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=3D18107&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 =
Thu Aug 2 16:15:06 2007
@@ -46,6 +46,7 @@
import org.jahia.services.acl.JahiaACLException;
import org.jahia.services.acl.JahiaBaseACL;
import org.jahia.services.cache.HtmlCache;
+import org.jahia.services.cache.ContainerHTMLCache;
import org.jahia.services.categories.Category;
import org.jahia.services.categories.CategoryService;
import org.jahia.services.containers.ContentContainer;
@@ -496,7 +497,7 @@
// ContentObject parent =3D ((ContentObject) objects.pe=
ek());
// }
ContentObjectKey key =3D null;
- if (!objects.isEmpty()) {
+ if (!objects.isEmpty() && objects.peek() !=3D null) {
key =3D new ContentPageKey(((ContentObject)objects.pee=
k()).getPageID());
}
final EngineMessage msg =3D new EngineMessage("org.jahia.e=
ngines.importexport.import.notimported", new Object[] {uuid, localName, lan=
guage, ""+ getLineNumber()});
@@ -584,6 +585,17 @@
logger.error("Cannot send event", e); =
}
}
+//
+// if (lastObject instanceof ContentContainer) {
+// try {
+// ContainerHTMLCache chtmlCache =3D ServicesRegistry.getIn=
stance().getCacheService().getContainerHTMLCacheInstance();
+// chtmlCache.invalidateContainerEntries(Integer.toString(l=
astObject.getID()));
+// } catch (JahiaInitializationException e) {
+// logger.error("Cannot send event", e);
+// }
+// }
+//
+//
}
=
public void restoreAcl(String aclString, ContentObject object) {
@@ -1104,6 +1116,7 @@
=
protected void update(ContentObject object, String localName, Attribut=
es atts) throws JahiaException {
int pageID =3D 0;
+ int containerID =3D 0;
if (object instanceof ContentField) {
ContentField cf =3D (ContentField) object;
ArrayList locales =3D new ArrayList();
@@ -1120,11 +1133,17 @@
updateField(jahiaField, fieldType, value, atts, -1);
ServicesRegistry.getInstance ().getJahiaFieldService ().sa=
veField (jahiaField, object.getAclID (), jParams);
}
-
+ containerID =3D cf.getContainerID();
pageID =3D cf.getPageID();
} else if (object instanceof ContentPage) {
ContentPage cp =3D (ContentPage) object;
pageID =3D updatePage(cp, localName, atts);
+
+ ContentField cf =3D (ContentField) cp.getParent(EntryLoadReque=
st.STAGED);
+
+ if (cf !=3D null) {
+ containerID =3D cf.getContainerID();
+ }
}
=
if (object !=3D null) {
@@ -1148,6 +1167,8 @@
if (htmlCache !=3D null) {
htmlCache.invalidatePageEntries(Integer.toString(pageID),Entry=
LoadRequest.STAGING_WORKFLOW_STATE);
}
+// ContainerHTMLCache chtmlCache =3D ServicesRegistry.getInstance()=
.getCacheService().getContainerHTMLCacheInstance();
+// chtmlCache.invalidateContainerEntries(Integer.toString(container=
ID));
}
=
private void updateField(JahiaField field, int fieldType, String value=
, Attributes atts, int parentAclID) throws JahiaException {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
