cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Fixing merge
Date Fri, 08 Jan 2016 16:53:50 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6cdfe4ba
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6cdfe4ba
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6cdfe4ba

Branch: refs/heads/3.0.x-fixes
Commit: 6cdfe4babfd9f8bd066f8d39ed0049001ac2fd0d
Parents: 99276ba
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jan 8 16:53:42 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jan 8 16:53:42 2016 +0000

----------------------------------------------------------------------
 .../https/httpclient/PublicSuffixListParser.java          | 10 +++++-----
 .../https/httpclient/DefaultHostnameVerifierTest.java     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/6cdfe4ba/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixListParser.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixListParser.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixListParser.java
index 5c4df13..2e1c124 100644
--- a/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixListParser.java
+++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/https/httpclient/PublicSuffixListParser.java
@@ -52,8 +52,8 @@ public final class PublicSuffixListParser {
      * @throws java.io.IOException on error while reading from list
      */
     public PublicSuffixList parse(final Reader reader) throws IOException {
-        final List<String> rules = new ArrayList<>();
-        final List<String> exceptions = new ArrayList<>();
+        final List<String> rules = new ArrayList<String>();
+        final List<String> exceptions = new ArrayList<String>();
         final BufferedReader r = new BufferedReader(reader);
 
         String line;
@@ -94,7 +94,7 @@ public final class PublicSuffixListParser {
      * @since 4.5
      */
     public List<PublicSuffixList> parseByType(final Reader reader) throws IOException
{
-        final List<PublicSuffixList> result = new ArrayList<>(2);
+        final List<PublicSuffixList> result = new ArrayList<PublicSuffixList>(2);
 
         final BufferedReader r = new BufferedReader(reader);
 
@@ -142,12 +142,12 @@ public final class PublicSuffixListParser {
 
             if (isException) {
                 if (exceptions == null) {
-                    exceptions = new ArrayList<>();
+                    exceptions = new ArrayList<String>();
                 }
                 exceptions.add(line);
             } else {
                 if (rules == null) {
-                    rules = new ArrayList<>();
+                    rules = new ArrayList<String>();
                 }
                 rules.add(line);
             }

http://git-wip-us.apache.org/repos/asf/cxf/blob/6cdfe4ba/rt/transports/http/src/test/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifierTest.java
----------------------------------------------------------------------
diff --git a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifierTest.java
b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifierTest.java
index 3ec14d1..b16dbfa 100644
--- a/rt/transports/http/src/test/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifierTest.java
+++ b/rt/transports/http/src/test/java/org/apache/cxf/transport/https/httpclient/DefaultHostnameVerifierTest.java
@@ -50,7 +50,7 @@ public class DefaultHostnameVerifierTest {
     private DefaultHostnameVerifier implWithPublicSuffixCheck;
 
     @Before
-    public void setup() {
+    public void setUp() {
         impl = new DefaultHostnameVerifier();
         publicSuffixMatcher = new PublicSuffixMatcher(DomainType.ICANN, Arrays.asList("com",
"co.jp", "gov.uk"), null);
         implWithPublicSuffixCheck = new DefaultHostnameVerifier(publicSuffixMatcher);


Mime
View raw message