[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Fix JavaHL testBasicProperties on Windows

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: 2007-04-11 23:24:44 CEST

Daniel Rall wrote:
> On Wed, 11 Apr 2007, Mark Phippard wrote:
>
>> The JavaHL properties functions were rewritten to use a new callback
>> API. When that API is called it passes in a path in a format like
>> C:/folder1/folder2/file.ext. This value is stored as a key in a Map.
>> When the getProperties method is later called it is passed a String in
>> the format C:\folder1\folder2\file.ext so it fails to find a value in
>> the Map.
>>
>> The attached patch fixes the problem by normalizing the path in the
>> get and set methods. I am not convinced this is the best solution and
>> I do not like that we are fixing it in our Impl method as it means
>> other people that implement the interface have to deal with the same
>> problem.
>>
>> I also fixed a potential NullPointerError that this test failure revealed.
>>
>> Index: subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java^M
>> ===================================================================^M
>> --- subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (revision 24532)^M
>> +++ subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (working copy)^M
>> @@ -1253,6 +1253,8 @@^M
>> properties(path, revision, pegRevision, false, callback);
>>
>> Map propMap = callback.getProperties(path);
>> + if (propMap == null)
>> + return new PropertyData[0];
>> PropertyData[] props = new PropertyData[propMap.size()];
>>
>> Iterator it = propMap.keySet().iterator();
>
> Please commit this portion of the patch.

Done, at Mark's request, in r24537.

-Hyrum

Received on Wed Apr 11 23:25:04 2007

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.