You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/06/19 18:13:56 UTC

svn commit: r1351760 - /subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java

Author: stsp
Date: Tue Jun 19 16:13:56 2012
New Revision: 1351760

URL: http://svn.apache.org/viewvc?rev=1351760&view=rev
Log:
Fix JavaHL runtime exception ArrayIndexOutOfBoundsException: 71

* subversion/bindings/src/org/apache/subversion/javahl/ClientNotifyInformation.java
  (Action): Added missing item for resolver_start and resolver_end.

Modified:
    subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java

Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1351760&r1=1351759&r2=1351760&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Tue Jun 19 16:13:56 2012
@@ -550,8 +550,11 @@ public class ClientNotifyInformation ext
         update_broken_lock ("broken lock removed"),
 
         /** Operation failed because a node is obstructed */
-        failed_obstructed ("failed by obstruction");
+        failed_obstructed ("failed by obstruction"),
 
+        /** Conflict resolver is starting/ending. */
+        conflict_resolver_start ("conflict resolver start"),
+        conflict_resolver_end ("conflict resolver end");
 
         /**
          * The description of the action.