Author: tdraier
Date: Fri Sep 14 13:14:05 2007
New Revision: 18471
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18471&repname=
=3Djahia
Log:
avoid npe when getting "doc" (port 18285)
Modified:
trunk/core/src/java/org/jahia/services/pages/JahiaPage.java
Modified: trunk/core/src/java/org/jahia/services/pages/JahiaPage.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/pages/JahiaPage.java&rev=3D18471&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
--- trunk/core/src/java/org/jahia/services/pages/JahiaPage.java (original)
+++ trunk/core/src/java/org/jahia/services/pages/JahiaPage.java Fri Sep 14 =
13:14:05 2007
@@ -18,12 +18,17 @@
=
package org.jahia.services.pages;
=
-import org.jahia.content.ContentPageXRefManager;
+import org.jahia.bin.Jahia;
import org.jahia.content.ContentObject;
+import org.jahia.content.ContentPageXRefManager;
+import org.jahia.data.fields.JahiaField;
import org.jahia.exceptions.JahiaException;
import org.jahia.exceptions.JahiaTemplateNotFoundException;
+import org.jahia.hibernate.manager.JahiaPagesManager;
+import org.jahia.hibernate.manager.SpringContextSingleton;
import org.jahia.params.ProcessingContext;
import org.jahia.registries.ServicesRegistry;
+import org.jahia.resourcebundle.JahiaResourceBundle;
import org.jahia.services.acl.ACLResourceInterface;
import org.jahia.services.acl.JahiaACLException;
import org.jahia.services.acl.JahiaBaseACL;
@@ -37,15 +42,10 @@
import org.jahia.services.version.StateModificationContext;
import org.jahia.utils.JahiaTools;
import org.jahia.utils.textdiff.HunkTextDiffVisitor;
-import org.jahia.hibernate.manager.JahiaPagesManager;
-import org.jahia.hibernate.manager.SpringContextSingleton;
-import org.jahia.data.fields.LoadFlags;
-import org.jahia.bin.Jahia;
-import org.jahia.resourcebundle.JahiaResourceBundle;
=
-import java.util.*;
-import java.io.Serializable;
import java.io.IOException;
+import java.io.Serializable;
+import java.util.*;
=
=
/**
@@ -360,7 +360,19 @@
* @deprecated
*/
public final String getDoc () {
- return "";
+ String longString=3D"0";
+ try {
+ JahiaField metadataDateField=3DgetContentPage().getMetadataAsJ=
ahiaField("creationDate", Jahia.getThreadParamBean());
+ if (metadataDateField =3D=3D null)
+ return "0";
+ longString=3D(String) metadataDateField.getObject();
+ if(longString=3D=3Dnull || longString.equals(""))
+ longString=3D"0";
+ return longString;
+ } catch (JahiaException e) {
+ return "0";
+ }
+
}
=
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
