← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/native/PatchCallback.cpp

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2015-08-07 21:32:47 UTC
  • mfrom: (0.2.15) (4.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20150807213247-ozyewtmgsr6tkewl
Tags: 1.9.0-1
http://bugs.debian.org/791844
* Upload to unstable
* New upstream release.
  + Security fixes
    - CVE-2015-3184: Mixed anonymous/authenticated path-based authz with
      httpd 2.4
    - CVE-2015-3187: svn_repos_trace_node_locations() reveals paths hidden
      by authz
* Add >= 2.7 requirement for python-all-dev Build-Depends, needed to run
  tests.
* Remove Build-Conflicts against ruby-test-unit.  (Closes: #791844)
* Remove patches/apache_module_dependency in favor of expressing the
  dependencies in authz_svn.load/dav_svn.load.
* Build-Depend on apache2-dev (>= 2.4.16) to ensure ap_some_authn_required()
  is available when building mod_authz_svn and Depend on apache2-bin (>=
  2.4.16) for runtime support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/bindings/javahl/native/PatchCallback.cpp
80
80
  static jmethodID mid = 0;
81
81
  if (mid == 0)
82
82
    {
83
 
      jclass clazz = env->FindClass(JAVA_PACKAGE"/callback/PatchCallback");
 
83
      jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/PatchCallback"));
84
84
      if (JNIUtil::isJavaExceptionThrown())
85
85
        POP_AND_RETURN(SVN_NO_ERROR);
86
86
 
106
106
  jboolean jfiltered = env->CallBooleanMethod(m_callback, mid, jcanonPath,
107
107
                                              jpatchAbsPath, jrejectAbsPath);
108
108
  if (JNIUtil::isJavaExceptionThrown())
109
 
    POP_AND_RETURN(SVN_NO_ERROR);
 
109
    POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
110
110
 
111
111
  *filtered = (jfiltered ? TRUE : FALSE);
112
112