Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 5647 invoked from network); 24 Sep 2009 16:07:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 24 Sep 2009 16:07:26 -0000 Received: (qmail 62288 invoked by uid 500); 24 Sep 2009 16:07:26 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 62237 invoked by uid 500); 24 Sep 2009 16:07:26 -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 62226 invoked by uid 99); 24 Sep 2009 16:07:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 24 Sep 2009 16:07:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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, 24 Sep 2009 16:07:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7CD4A2388897; Thu, 24 Sep 2009 16:07:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r818528 - /jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java Date: Thu, 24 Sep 2009 16:07:04 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090924160704.7CD4A2388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mduerig Date: Thu Sep 24 16:07:04 2009 New Revision: 818528 URL: http://svn.apache.org/viewvc?rev=818528&view=rev Log: JCR-2326: some jcr-client tests fail if a server runs on localhost:80 Temporarily fix Modified: jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java Modified: jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java?rev=818528&r1=818527&r2=818528&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java (original) +++ jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java Thu Sep 24 16:07:04 2009 @@ -80,6 +80,7 @@ import org.apache.jackrabbit.spi.SessionInfo; import org.apache.jackrabbit.spi.Subscription; import org.apache.jackrabbit.spi.commons.logging.Slf4jLogWriterProvider; +import org.apache.jackrabbit.webdav.DavException; public class RepositoryFactoryImplTest extends TestCase { private final RepositoryFactory factory = new RepositoryFactoryImpl(); @@ -149,7 +150,8 @@ Repository repo = factory.getRepository(parameters); assertNotNull(repo); } catch (RepositoryException e) { - if (!ConnectException.class.isInstance(e.getCause())) { + if (!(ConnectException.class.isInstance(e.getCause()) || + DavException.class.isInstance(e.getCause()))) { throw e; } } @@ -164,9 +166,10 @@ Repository repo = factory.getRepository(parameters); assertNotNull(repo); } catch (RepositoryException e) { - if (!ConnectException.class.isInstance(e.getCause())) { - throw e; - } + if (!(ConnectException.class.isInstance(e.getCause()) || + DavException.class.isInstance(e.getCause()))) { + throw e; + } } }