You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/03/16 03:18:05 UTC
svn commit: r1666851 - in /subversion/trunk/subversion/bindings/javahl:
native/RemoteSession.cpp
tests/org/apache/subversion/javahl/SVNRemoteTests.java
Author: rhuijben
Date: Mon Mar 16 02:18:05 2015
New Revision: 1666851
URL: http://svn.apache.org/r1666851
Log:
In JavaHL: Make RemoteSession.getLog() implement its documented behavior
when the list of revision properties is NULL.
* subversion/bindings/javahl/native/RemoteSession.cpp
(RemoteSession::getLog): Pass NULL revision property list if java provides
a NULL list. (An empty list is handled as no properties. The Iterator
handles NULL as no items).
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
(testGetLog): Assert that revision properties are really fetched.
Modified:
subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Modified: subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1666851&r1=1666850&r2=1666851&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/RemoteSession.cpp Mon Mar 16 02:18:05 2015
@@ -877,8 +877,10 @@ RemoteSession::getLog(jobject jpaths,
true, subPool);
if (JNIUtil::isJavaExceptionThrown())
return;
- const apr_array_header_t* revprops = build_string_array(revpropiter,
- false, subPool);
+ const apr_array_header_t* revprops = (jrevprops != NULL)
+ ? build_string_array(revpropiter,
+ false, subPool)
+ : NULL;
if (JNIUtil::isJavaExceptionThrown())
return;
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1666851&r1=1666850&r2=1666851&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Mon Mar 16 02:18:05 2015
@@ -937,6 +937,7 @@ public class SVNRemoteTests extends SVNT
0, false, false, false, null,
receiver);
assertEquals(1, receiver.logs.size());
+ assertTrue(receiver.logs.get(0).revprops.size() > 0);
receiver.logs.clear();
session.reparent(getTestRepoUrl() + "/A");
@@ -945,6 +946,7 @@ public class SVNRemoteTests extends SVNT
0, 0, false, false, false, null,
receiver);
assertEquals(2, receiver.logs.size());
+ assertTrue(receiver.logs.get(0).revprops.size() > 0);
}
public void testGetLogMissing() throws Exception