jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mreut...@apache.org
Subject svn commit: r633834 - /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentVersioningWithTransactionsTest.java
Date Wed, 05 Mar 2008 12:33:59 GMT
Author: mreutegg
Date: Wed Mar  5 04:33:55 2008
New Revision: 633834

URL: http://svn.apache.org/viewvc?rev=633834&view=rev
Log:
JCR-1275: NullPointerException in AbstractVersionManager.createVersionHistory()
- fix test case

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentVersioningWithTransactionsTest.java

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentVersioningWithTransactionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentVersioningWithTransactionsTest.java?rev=633834&r1=633833&r2=633834&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentVersioningWithTransactionsTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/ConcurrentVersioningWithTransactionsTest.java
Wed Mar  5 04:33:55 2008
@@ -23,6 +23,7 @@
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
+import javax.jcr.InvalidItemStateException;
 import javax.jcr.version.Version;
 import javax.transaction.UserTransaction;
 
@@ -66,6 +67,8 @@
                         n.addMixin(mixVersionable);
                         session.save();
                         utx.commit();
+                    } catch (InvalidItemStateException e) {
+                        // ignore
                     } catch (Exception e) {
                         final Throwable deepCause = getLevel2Cause(e);
                         if (deepCause != null && deepCause instanceof StaleItemStateException)
{



Mime
View raw message