You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2007/09/14 15:34:18 UTC
svn commit: r575674 -
/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
Author: reschke
Date: Fri Sep 14 06:34:17 2007
New Revision: 575674
URL: http://svn.apache.org/viewvc?rev=575674&view=rev
Log:
JCR-1133: in getQLabels(), skip jcr:mixinTypes as well.
Modified:
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java?rev=575674&r1=575673&r2=575674&view=diff
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java Fri Sep 14 06:34:17 2007
@@ -342,13 +342,12 @@
private QName[] getQLabels() throws RepositoryException {
refreshEntry(labelNodeEntry);
List labelQNames = new ArrayList();
- Iterator it = labelNodeEntry.getPropertyEntries();
- while (it.hasNext()) {
+ for (Iterator it = labelNodeEntry.getPropertyEntries(); it.hasNext(); ) {
PropertyEntry pe = (PropertyEntry) it.next();
- if (QName.JCR_PRIMARYTYPE.equals(pe.getQName())) {
- continue;
+ if (! QName.JCR_PRIMARYTYPE.equals(pe.getQName()) &&
+ ! QName.JCR_MIXINTYPES.equals(pe.getQName())) {
+ labelQNames.add(pe.getQName());
}
- labelQNames.add(pe.getQName());
}
return (QName[]) labelQNames.toArray(new QName[labelQNames.size()]);
}