Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D78AD9112 for ; Thu, 10 Nov 2011 12:06:54 +0000 (UTC) Received: (qmail 64184 invoked by uid 500); 10 Nov 2011 12:06:54 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 64133 invoked by uid 500); 10 Nov 2011 12:06:54 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 64125 invoked by uid 99); 10 Nov 2011 12:06:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 12:06:53 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Nov 2011 12:06:51 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 25A4B23888E4; Thu, 10 Nov 2011 12:06:30 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1200285 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Date: Thu, 10 Nov 2011 12:06:30 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111110120630.25A4B23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Thu Nov 10 12:06:29 2011 New Revision: 1200285 URL: http://svn.apache.org/viewvc?rev=1200285&view=rev Log: JCR-3143 : SessionImpl#isSupportedOption: Skip descriptor evaluation if descriptor has not been loaded Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java?rev=1200285&r1=1200284&r2=1200285&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java Thu Nov 10 12:06:29 2011 @@ -933,17 +933,37 @@ public class SessionImpl extends Abstrac *
    *
  • {@link Repository#LEVEL_1_SUPPORTED}
    • *
  • {@link Repository#LEVEL_2_SUPPORTED}
    • - *
  • {@link Repository#OPTION_TRANSACTIONS_SUPPORTED}
    • - *
  • {@link Repository#OPTION_VERSIONING_SUPPORTED}
    • - *
  • {@link Repository#OPTION_OBSERVATION_SUPPORTED}
    • + *
  • {@link Repository#OPTION_ACCESS_CONTROL_SUPPORTED}
    • + *
  • {@link Repository#OPTION_ACTIVITIES_SUPPORTED}
    • + *
  • {@link Repository#OPTION_BASELINES_SUPPORTED}
    • + *
  • {@link Repository#OPTION_JOURNALED_OBSERVATION_SUPPORTED}
    • + *
  • {@link Repository#OPTION_LIFECYCLE_SUPPORTED}
    • *
  • {@link Repository#OPTION_LOCKING_SUPPORTED}
    • + *
  • {@link Repository#OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED}
    • + *
  • {@link Repository#OPTION_NODE_TYPE_MANAGEMENT_SUPPORTED}
    • + *
  • {@link Repository#OPTION_OBSERVATION_SUPPORTED}
    • *
  • {@link Repository#OPTION_QUERY_SQL_SUPPORTED}
    • + *
  • {@link Repository#OPTION_RETENTION_SUPPORTED}
    • + *
  • {@link Repository#OPTION_SHAREABLE_NODES_SUPPORTED}
    • + *
  • {@link Repository#OPTION_SIMPLE_VERSIONING_SUPPORTED}
    • + *
  • {@link Repository#OPTION_TRANSACTIONS_SUPPORTED}
    • + *
  • {@link Repository#OPTION_UNFILED_CONTENT_SUPPORTED}
    • + *
  • {@link Repository#OPTION_UPDATE_MIXIN_NODE_TYPES_SUPPORTED}
    • + *
  • {@link Repository#OPTION_UPDATE_PRIMARY_NODE_TYPE_SUPPORTED}
    • + *
  • {@link Repository#OPTION_VERSIONING_SUPPORTED}
    • + *
  • {@link Repository#OPTION_WORKSPACE_MANAGEMENT_SUPPORTED}
    • + *
  • {@link Repository#OPTION_XML_EXPORT_SUPPORTED}
    • + *
  • {@link Repository#OPTION_XML_IMPORT_SUPPORTED}
    • + *
  • {@link Repository#WRITE_SUPPORTED}
    • *
* @return true if the repository supports the given option. False otherwise. */ boolean isSupportedOption(String option) { String desc = repository.getDescriptor(option); - return Boolean.valueOf(desc); + // if the descriptors are not available return true. the missing + // functionality of the given SPI impl will in this case be detected + // upon the corresponding SPI call (see JCR-3143). + return (desc == null) ? true : Boolean.valueOf(desc); } /**