You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2009/09/24 18:07:04 UTC
svn commit: r818528 -
/jackrabbit/trunk/jackrabbit-jcr-client/src/test/java/org/apache/jackrabbit/client/RepositoryFactoryImplTest.java
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;
+ }
}
}