[jakarta-jmeter] 05/06: Fixed the compatibility with libhttpclient-java (>= 4.3)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jakarta-jmeter.

commit e8a7d849eee5b2b5c9da172706e0eb82a1fe31ab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Mar 30 01:38:25 2016 +0200

    Fixed the compatibility with libhttpclient-java (>= 4.3)
---
 debian/changelog                                   |  1 +
 debian/control                                     |  2 +-
 .../patches/09_httpcomponents-compatibility.patch  | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 32f16c6..2904586 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ jakarta-jmeter (2.13-1) UNRELEASED; urgency=medium
     - New dependency on libdnsjava-java
     - New dependency on libcommons-math3-java
     - New dependency on libcommons-pool2-java
+    - Fixed the compatibility with libhttpclient-java (>= 4.3)
   * Moved the package to Git
   * Standards-Version updated to 3.9.7 (no changes)
 
diff --git a/debian/control b/debian/control
index 46badbc..8f8c501 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Build-Depends-Indep: default-jdk,
                      libexcalibur-logkit-java,
                      libgeronimo-jms-1.1-spec-java,
                      libhtmlparser-java,
-                     libhttpclient-java,
+                     libhttpclient-java (>= 4.3),
                      libhttpmime-java,
                      libjcharts-java,
                      libjdom1-java,
diff --git a/debian/patches/09_httpcomponents-compatibility.patch b/debian/patches/09_httpcomponents-compatibility.patch
new file mode 100644
index 0000000..1cc6a4e
--- /dev/null
+++ b/debian/patches/09_httpcomponents-compatibility.patch
@@ -0,0 +1,26 @@
+Description: Fix the compatibility with httpcomponents-client >= 4.3
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
++++ b/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
+@@ -265,5 +265,20 @@
+         public HttpConnectionMetrics getMetrics() {
+             return handler.getMetrics();
+         }
++
++        @Override
++        public String getId() {
++            return handler.getId();
++        }
++
++        @Override
++        public void bind(java.net.Socket socket) throws IOException {
++            handler.bind(socket);
++        }
++
++        @Override
++        public java.net.Socket getSocket() {
++            return handler.getSocket();
++        }
+     }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 7b66ba5..721168c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 06_link-to-system-javadoc.patch
 07_ignore-tika.patch
 08_bouncycastle-1.51.patch
+09_httpcomponents-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jakarta-jmeter.git