Author: hwright Date: Wed Aug 17 12:42:39 2011 New Revision: 1158664 URL: http://svn.apache.org/viewvc?rev=1158664&view=rev Log: Merge r1157416 from trunk:
* r1157416 Fix problem with a missing JavaHL class from package renaming. Justification: When this error occurrs, users receive Class not found exception instead of the error. Votes: +1: markphip, rhuijben Added: subversion/branches/1.7.x/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java - copied unchanged from r1157416, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java Removed: subversion/branches/1.7.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java Modified: subversion/branches/1.7.x/ (props changed) subversion/branches/1.7.x/STATUS subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Propchange: subversion/branches/1.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Aug 17 12:42:39 2011 @@ -55,4 +55,4 @@ /subversion/branches/tree-conflicts:868291-873154 /subversion/branches/tree-conflicts-notify:873926-874008 /subversion/branches/uris-as-urls:1060426-1064427 -/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1158193-1158194,1158285,1158288,1158303 +/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154273,1154461,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303 Modified: subversion/branches/1.7.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158664&r1=1158663&r2=1158664&view=diff ============================================================================== --- subversion/branches/1.7.x/STATUS (original) +++ subversion/branches/1.7.x/STATUS Wed Aug 17 12:42:39 2011 @@ -265,14 +265,6 @@ Approved changes: Votes: +1: markphip, rhuijben - * r1157416 - Fix problem with a missing JavaHL class from package renaming. - Justification: - When this error occurrs, users receive Class not found exception - instead of the error. - Votes: - +1: markphip, rhuijben - * r1154165 Make the cmdline argument parser ignore upgrade required errors to allow calling 'svn upgrade c:\iNVALID' on 'C:\Invalid' without an Modified: subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1158664&r1=1158663&r2=1158664&view=diff ============================================================================== --- subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original) +++ subversion/branches/1.7.x/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Wed Aug 17 12:42:39 2011 @@ -130,6 +130,35 @@ public class BasicTests extends SVNTests } /** + * Test the JNIError class functionality + * @throws Throwable + */ + public void testJNIError() throws Throwable + { + // build the test setup. + OneTest thisTest = new OneTest(); + + // Create a client, dispose it, then try to use it later + ISVNClient tempclient = new SVNClient(); + tempclient.dispose(); + + // create Y and Y/Z directories in the repository + addExpectedCommitItem(null, thisTest.getUrl().toString(), "Y", NodeKind.none, + CommitItemStateFlags.Add); + Set<String> urls = new HashSet<String>(1); + urls.add(thisTest.getUrl() + "/Y"); + try + { + tempclient.mkdir(urls, false, null, new ConstMsg("log_msg"), null); + } + catch(JNIError e) + { + return; // Test passes! + } + fail("A JNIError should have been thrown here."); + } + + /** * Tests Mergeinfo and RevisionRange classes. * @since 1.5 */