Author: stsp
Date: Tue Jun 19 20:12:34 2012
New Revision: 1351834
URL: http://svn.apache.org/viewvc?rev=1351834&view=rev
Log:
Fix a crash in JavaHL due to my recent changes for delayed invocation of
the interactive conflict resolution callback.
Conflict descriptions read back from conflict storage lack some information
previously passed to the callback during a running update/merge process.
JavaHL's tigris.org backwards compat code unconditionally dereferenced
pointers to the left/mine versions contained in conflict descriptions,
which are no longer provided because of my changes :(
Let's hope we can fix this properly in the short term by persisting more
information about conflicts in the conflict store (hi Bert!) and then reading
it back from there. For now, just avoid dereferencing null pointers.
*
subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
(ConflictDescriptor): Don't dereference null ConflictVersions in the conflict
description provided by the org.apache Java code.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java?rev=1351834&r1=1351833&r2=1351834&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictDescriptor.java
Tue Jun 19 20:12:34 2012
@@ -125,8 +125,12 @@ public class ConflictDescriptor
aDesc.getAction().ordinal(), aDesc.getReason().ordinal(),
aDesc.getOperation().ordinal(), aDesc.getBasePath(),
aDesc.getTheirPath(), aDesc.getMyPath(), aDesc.getMergedPath(),
- new ConflictVersion(aDesc.getSrcLeftVersion()),
- new ConflictVersion(aDesc.getSrcRightVersion()));
+ aDesc.getSrcLeftVersion() != null
+ ? new ConflictVersion(aDesc.getSrcLeftVersion())
+ : null,
+ aDesc.getSrcRightVersion() != null
+ ? new ConflictVersion(aDesc.getSrcRightVersion())
+ : null);
}
public String getPath()
