← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/bindings/javahl/native/DiffSummaryReceiver.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/DiffSummaryReceiver.cpp
69
69
  if (callback == 0)
70
70
    {
71
71
      // Initialize the method ID.
72
 
      clazz = env->FindClass(JAVA_PACKAGE "/callback/DiffSummaryCallback");
 
72
      clazz = env->FindClass(JAVAHL_CLASS("/callback/DiffSummaryCallback"));
73
73
      if (JNIUtil::isJavaExceptionThrown())
74
74
        POP_AND_RETURN(SVN_NO_ERROR);
75
75
 
76
76
      callback = env->GetMethodID(clazz, "onSummary",
77
 
                                  "(L"JAVA_PACKAGE"/DiffSummary;)V");
 
77
                                  "(" JAVAHL_ARG("/DiffSummary;") ")V");
78
78
      if (JNIUtil::isJavaExceptionThrown() || callback == 0)
79
79
        POP_AND_RETURN(SVN_NO_ERROR);
80
80
    }
82
82
  // Do some prep work for tranforming the DIFF parameter into a
83
83
  // Java equivalent.
84
84
  static jmethodID ctor = 0;
85
 
  clazz = env->FindClass(JAVA_PACKAGE "/DiffSummary");
 
85
  clazz = env->FindClass(JAVAHL_CLASS("/DiffSummary"));
86
86
  if (JNIUtil::isJavaExceptionThrown())
87
87
    POP_AND_RETURN(SVN_NO_ERROR);
88
88
 
90
90
    {
91
91
      ctor = env->GetMethodID(clazz, "<init>",
92
92
                              "(Ljava/lang/String;"
93
 
                              "L"JAVA_PACKAGE"/DiffSummary$DiffKind;Z"
94
 
                              "L"JAVA_PACKAGE"/types/NodeKind;)V");
 
93
                              JAVAHL_ARG("/DiffSummary$DiffKind;") "Z"
 
94
                              JAVAHL_ARG("/types/NodeKind;") ")V");
95
95
      if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
96
96
        POP_AND_RETURN(SVN_NO_ERROR);
97
97
    }
117
117
 
118
118
  // Invoke the Java DiffSummaryReceiver callback.
119
119
  env->CallVoidMethod(m_receiver, callback, jDiffSummary);
120
 
  // We return whether an exception was thrown or not.
121
 
 
122
 
  env->PopLocalFrame(NULL);
123
 
  return SVN_NO_ERROR;
 
120
  POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
124
121
}