knguyen 2005/05/20 13:46:03 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/java/org/jahia/services/webdav DAVFileAccess.java
Log:
- fix Dav file access and null pointer when jParams.getRealRequest() is null.
- limit the load of document to index to 300 max in queue to avoid memory
peak.
Revision Changes Path
1.22.2.2.2.5 +1 -1
jahia/src/java/org/jahia/services/webdav/DAVFileAccess.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/webdav/DAVFileAccess.java.diff?r1=1.22.2.2.2.4&r2=1.22.2.2.2.5&f=h
Index: DAVFileAccess.java
===================================================================
RCS file:
/home/cvs/repository/jahia/src/java/org/jahia/services/webdav/Attic/DAVFileAccess.java,v
retrieving revision 1.22.2.2.2.4
retrieving revision 1.22.2.2.2.5
diff -u -r1.22.2.2.2.4 -r1.22.2.2.2.5
--- DAVFileAccess.java 27 Apr 2005 09:22:00 -0000 1.22.2.2.2.4
+++ DAVFileAccess.java 20 May 2005 11:46:03 -0000 1.22.2.2.2.5
@@ -97,7 +97,7 @@
this.site = site;
this.user = user;
if (jParams!= null) {
- if (jParams.getRequest() != null) {
+ if (jParams.getRequest() != null && jParams.getRealRequest() !=
null ) {
this.webDavServerPath = jParams.getRequest().getContextPath()
+ "/webdav/site/" +
jParams.getSiteKey();
} else if (Jahia.getContextPath() != null) {
