You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/11/21 08:58:49 UTC
svn commit: r477560 - in
/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report:
ExpandPropertyReport.java VersionTreeReport.java
Author: angela
Date: Mon Nov 20 23:58:49 2006
New Revision: 477560
URL: http://svn.apache.org/viewvc?view=rev&rev=477560
Log:
avoid warning: don't access members of non-collection resources
Modified:
jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java
jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java
Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java?view=diff&rev=477560&r1=477559&r2=477560
==============================================================================
--- jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java (original)
+++ jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/ExpandPropertyReport.java Mon Nov 20 23:58:49 2006
@@ -166,7 +166,7 @@
private void addResponses(DavResource res, int depth, MultiStatus ms) {
MultiStatusResponse response = getResponse(res, propertyElements);
ms.addResponse(response);
- if (depth > 0) {
+ if (depth > 0 && res.isCollection()) {
DavResourceIterator it = res.getMembers();
while (it.hasNext()) {
addResponses(it.nextResource(), depth-1, ms);
Modified: jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java?view=diff&rev=477560&r1=477559&r2=477560
==============================================================================
--- jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java (original)
+++ jackrabbit/trunk/jcr-server/webdav/src/java/org/apache/jackrabbit/webdav/version/report/VersionTreeReport.java Mon Nov 20 23:58:49 2006
@@ -156,7 +156,7 @@
} catch (DavException e) {
log.error(e.toString());
}
- if (depth > 0) {
+ if (depth > 0 && res.isCollection()) {
DavResourceIterator it = res.getMembers();
while (it.hasNext()) {
buildResponse(it.nextResource(), propNameSet, depth-1, ms);