File _service:tar_scm:0001-Use-system-copy-of-effect... of Package httpcomponents-client

File _service:tar_scm:0001-Use-system-copy-of-effective_tld_names.dat.patch of Package httpcomponents-client (Revision 8145f469518d517a40300eeee02a77e1)

Currently displaying revision 8145f469518d517a40300eeee02a77e1 , Show latest

From 3514ce0f38dddafd052d76e6a0da9bbb862ff8a4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Jan 2015 16:04:31 +0100
Subject: [PATCH] Use system copy of effective_tld_names.dat

---
 .../java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
index 8783c5b..c858220 100644
--- a/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
+++ b/httpclient/src/main/java/org/apache/http/conn/util/PublicSuffixMatcherLoader.java
@@ -82,11 +82,10 @@ public final class PublicSuffixMatcherLoader {
         if (DEFAULT_INSTANCE == null) {
             synchronized (PublicSuffixMatcherLoader.class) {
                 if (DEFAULT_INSTANCE == null){
-                    final URL url = PublicSuffixMatcherLoader.class.getResource(
-                            "/mozilla/public-suffix-list.txt");
-                    if (url != null) {
+                    final File file = new File("/usr/share/publicsuffix/effective_tld_names.dat");
+                    if (file.exists()) {
                         try {
-                            DEFAULT_INSTANCE = load(url);
+                            DEFAULT_INSTANCE = load(file);
                         } catch (final IOException ex) {
                             // Should never happen
                             final Log log = LogFactory.getLog(PublicSuffixMatcherLoader.class);
-- 
2.9.3