You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2019/06/13 09:37:14 UTC

[sling-whiteboard] 05/08: Explicitly look for the default contructors when needed instead of relying on the declaration order.

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit 1a63417217c60810ee8135a9539d0b84ecd211ce
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Jun 12 18:02:59 2019 +0200

    Explicitly look for the default contructors when needed instead of relying on the declaration order.
---
 .../java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java  | 3 +--
 .../main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/url-connection-agent/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java b/url-connection-agent/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
index 230c1db..d389518 100644
--- a/url-connection-agent/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
+++ b/url-connection-agent/src/main/java/org/apache/sling/uca/impl/HttpClient4TimeoutTransformer.java
@@ -56,8 +56,7 @@ public class HttpClient4TimeoutTransformer implements ClassFileTransformer {
                 ClassPool defaultPool = ClassPool.getDefault();
                 CtClass cc = defaultPool.get(Descriptor.toJavaName(className));
                 
-                // TODO - access the default constructor explicitly in case it changes
-                CtConstructor noArgCtor =  cc.getConstructors()[0];
+                CtConstructor noArgCtor = cc.getConstructor(Descriptor.ofConstructor(new CtClass[0]));
                 CtField connectTimeout = cc.getDeclaredField("connectTimeout");
                 CtField socketTimeout = cc.getDeclaredField("socketTimeout");
                 noArgCtor.insertAfter("this." + connectTimeout.getName() + " = " + connectTimeoutMillis + ";");
diff --git a/url-connection-agent/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java b/url-connection-agent/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
index a93e223..22a660e 100644
--- a/url-connection-agent/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
+++ b/url-connection-agent/src/main/java/org/apache/sling/uca/impl/OkHttpTimeoutTransformer.java
@@ -54,8 +54,7 @@ public class OkHttpTimeoutTransformer implements ClassFileTransformer {
                 ClassPool defaultPool = ClassPool.getDefault();
                 CtClass cc = defaultPool.get(Descriptor.toJavaName(className));
                 
-                // TODO - access the default constructor explicitly in case it changes
-                CtConstructor noArgCtor =  cc.getConstructors()[0];
+                CtConstructor noArgCtor = cc.getConstructor(Descriptor.ofConstructor(new CtClass[0]));
                 CtField connectTimeout = cc.getDeclaredField("connectTimeout");
                 CtField readTimeout = cc.getDeclaredField("readTimeout");
                 noArgCtor.insertAfter("this." + connectTimeout.getName() + " = " + connectTimeoutMillis + ";");