On Mon, May 16, 2011 at 2:50 PM, <[email protected]> wrote:
> Author: markphip
> Date: Mon May 16 18:50:40 2011
> New Revision: 1103838
>
> URL: http://svn.apache.org/viewvc?rev=1103838&view=rev
> Log:
> JavaHL: Fixed JNI code to look for the new UserPasswordCallback class
> in place of the old PromptUserPasswordN classes. Also removed/updated
> code comments that referenced the old class.
>
> Our test suite does not exercise this code unless you run the JavaHL
> tests against https:// repository (which no one does).
>
> [ in subversion/bindings/javahl/ ]
>
> * native/Prompter.cpp
> Replaced references to PromptUserPasswordN with UserPasswordCallback.
> Also removed and updated stale comments.
>
> * native/Prompter.h
> Removed stale comments.
Hyrum,
I did a simple audit of the JavaHL C++ code after this. Basically I
grepped for:
"env->FindClass(JAVA_PACKAGE"
These are the only two remaining suspicious items. Could you take a look?
Revision.cpp (line 161):
JNIEnv *env = JNIUtil::getEnv();
jclass clazz = env->FindClass(JAVA_PACKAGE "/Revision");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
And SVNRepos.cpp (line 638):
JNIEnv *env = JNIUtil::getEnv();
jclass clazz = env->FindClass(JAVA_PACKAGE"/Lock");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
In both cases, those items are now in the "types" package. Attaching
a patch to change those.
--
Thanks
Mark Phippard
http://markphip.blogspot.com/
Index: subversion/bindings/javahl/native/SVNRepos.cpp
===================================================================
--- subversion/bindings/javahl/native/SVNRepos.cpp (revision 1103821)
+++ subversion/bindings/javahl/native/SVNRepos.cpp (working copy)
@@ -635,7 +635,7 @@
NULL);
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE"/Lock");
+ jclass clazz = env->FindClass(JAVA_PACKAGE"/types/Lock");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
Index: subversion/bindings/javahl/native/Revision.cpp
===================================================================
--- subversion/bindings/javahl/native/Revision.cpp (revision 1103821)
+++ subversion/bindings/javahl/native/Revision.cpp (working copy)
@@ -158,7 +158,7 @@
Revision::makeJRevision(svn_revnum_t rev)
{
JNIEnv *env = JNIUtil::getEnv();
- jclass clazz = env->FindClass(JAVA_PACKAGE "/Revision");
+ jclass clazz = env->FindClass(JAVA_PACKAGE "/types/Revision");
if (JNIUtil::isJavaExceptionThrown())
return NULL;
