resolve properties fix

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
eclipse-ee4j · Sep 24, 2020 · f8ae767 · f8ae767
1 parent 3b1d207
commit f8ae767
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/core-client/src/main/java/org/glassfish/jersey/client/ClientRequest.java b/core-client/src/main/java/org/glassfish/jersey/client/ClientRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -167,7 +167,7 @@ public <T> T resolveProperty(final String name, final T defaultValue) {
 
     private <T> T resolveProperty(final String name, Object defaultValue, final Class<T> type) {
         // Check runtime configuration first
-        Object result = clientConfig.getProperty(name);
+        Object result = getConfiguration().getProperty(name);
         if (result != null) {
             defaultValue = result;
         }

diff --git a/core-client/src/main/java/org/glassfish/jersey/client/internal/HttpUrlConnector.java b/core-client/src/main/java/org/glassfish/jersey/client/internal/HttpUrlConnector.java
@@ -530,15 +530,13 @@ public Object run() throws NoSuchFieldException,
         }
     }
 
-    private void processExpect100Continue(ClientRequest request, HttpURLConnection uc,
+    private static void processExpect100Continue(ClientRequest request, HttpURLConnection uc,
                                           long length, RequestEntityProcessing entityProcessing) {
-
-        final Boolean expectContinueActivated = ClientProperties.getValue(request.getConfiguration().getProperties(),
+        final Boolean expectContinueActivated = request.resolveProperty(
                 ClientProperties.EXPECT_100_CONTINUE, Boolean.class);
-        final Long expectContinueSizeThreshold = ClientProperties.getValue(
-                request.getConfiguration().getProperties(),
+        final Long expectContinueSizeThreshold = request.resolveProperty(
                 ClientProperties.EXPECT_100_CONTINUE_THRESHOLD_SIZE,
-                ClientProperties.DEFAULT_EXPECT_100_CONTINUE_THRESHOLD_SIZE, Long.class);
+                ClientProperties.DEFAULT_EXPECT_100_CONTINUE_THRESHOLD_SIZE);
 
         final boolean allowStreaming = length > expectContinueSizeThreshold
                 || entityProcessing == RequestEntityProcessing.CHUNKED;

diff --git a/...st/java/org/glassfish/jersey/tests/e2e/client/httpurlconnector/Expect100ContinueTest.java b/...st/java/org/glassfish/jersey/tests/e2e/client/httpurlconnector/Expect100ContinueTest.java
@@ -69,11 +69,6 @@ protected Application configure() {
         return new ResourceConfig(Expect100ContinueTest.Expect100ContinueResource.class);
     }
 
-    @Override
-    protected void configureClient(ClientConfig config) {
-        config.connectorProvider(new HttpUrlConnectorProvider());
-    }
-
     @Test
     public void testExpect100Continue() {
        final Response response =  target(RESOURCE_PATH).request().post(Entity.text(ENTITY_STRING));