Skip to content

Commit c96271c

Browse files
committed
Bug 37155832 - [36530062->25.03] Add backwards compatibility support to looking up undocumented system properties configured with prefix of fully qualified class name (main->ce-main)
Remote remote.full on coherence-ce/main success, changes 112058, synced @112058, job.9.20241021152244.20687 [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 112062]
1 parent 0c02a2f commit c96271c

File tree

8 files changed

+33
-20
lines changed

8 files changed

+33
-20
lines changed

prj/coherence-core/src/main/java/com/oracle/coherence/common/internal/net/socketbus/SharedBuffer.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.oracle.coherence.common.internal.net.socketbus;
88

@@ -11,6 +11,9 @@
1111
import com.oracle.coherence.common.base.Holder;
1212

1313
import com.oracle.coherence.common.io.BufferSequence;
14+
15+
import com.tangosol.coherence.config.Config;
16+
1417
import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
1518

1619
import java.nio.ByteBuffer;
@@ -314,6 +317,6 @@ public interface Disposer
314317
/**
315318
* True iff dispose locations should be tracked (for debugging)
316319
*/
317-
private static final boolean TRACK_DISPOSE = Boolean.getBoolean(
320+
private static final boolean TRACK_DISPOSE = Config.getBoolean(
318321
BufferSequence.class.getName() + ".trackDispose");
319322
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/internal/util/ApplicationLoader.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.oracle.coherence.common.internal.util;
88

9+
import com.tangosol.coherence.config.Config;
910
import java.lang.reflect.InvocationTargetException;
1011
import java.lang.reflect.Method;
1112
import java.lang.reflect.Modifier;
@@ -204,5 +205,5 @@ private static void usage()
204205
/**
205206
* Indicates if the launched applications should share the system classpath.
206207
*/
207-
private static final boolean SHARED_ROOT = Boolean.getBoolean(ApplicationLoader.class.getName() + ".sharedRoot");
208+
private static final boolean SHARED_ROOT = Config.getBoolean(ApplicationLoader.class.getName() + ".sharedRoot");
208209
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/io/BufferManagers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,6 @@ public void dispose()
305305
*
306306
* There is a performance impact to enabling this, it effectively negates the benefits of zcopy
307307
*/
308-
public static final boolean ZERO_ON_RELEASE = Boolean.getBoolean(
308+
public static final boolean ZERO_ON_RELEASE = Config.getBoolean(
309309
BufferManagers.class.getName() + ".zeroed");
310310
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/io/DoubleBufferSequence.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.oracle.coherence.common.io;
88

99

10+
import com.tangosol.coherence.config.Config;
11+
1012
import java.io.IOException;
1113
import java.nio.ByteBuffer;
1214
import java.util.concurrent.atomic.AtomicInteger;
@@ -324,6 +326,6 @@ else if ((n & 0x10) == 0 && compareAndSet(n, n | 0x10))
324326
/**
325327
* True iff dispose locations should be tracked (for debugging)
326328
*/
327-
private static final boolean TRACK_DISPOSE = Boolean.getBoolean(
329+
private static final boolean TRACK_DISPOSE = Config.getBoolean(
328330
BufferSequence.class.getName() + ".trackDispose");
329331
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/io/Files.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.oracle.coherence.common.io;
88

9+
import com.tangosol.coherence.config.Config;
10+
911
import java.io.BufferedReader;
1012
import java.io.File;
1113
import java.io.FileReader;
@@ -150,5 +152,5 @@ public static boolean isLocal(File file, final boolean fAssumeLocal)
150152
/**
151153
* The default value to assume if it cannot be determined if a path is local or not.
152154
*/
153-
protected static final boolean ASSUME_LOCAL = Boolean.getBoolean(Files.class.getCanonicalName() + ".assumeLocal");
155+
protected static final boolean ASSUME_LOCAL = Config.getBoolean(Files.class.getCanonicalName() + ".assumeLocal");
154156
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/io/MultiBufferSequence.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package com.oracle.coherence.common.io;
88

99

10+
import com.tangosol.coherence.config.Config;
1011
import java.io.IOException;
1112
import java.nio.ByteBuffer;
1213
import java.util.concurrent.atomic.AtomicInteger;
@@ -345,6 +346,6 @@ private final ByteBuffer getSafeBuffer(int i)
345346
/**
346347
* True iff dispose locations should be tracked (for debugging)
347348
*/
348-
private static final boolean TRACK_DISPOSE = Boolean.getBoolean(
349+
private static final boolean TRACK_DISPOSE = Config.getBoolean(
349350
BufferSequence.class.getName() + ".trackDispose");
350351
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/io/SingleBufferSequence.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024, Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.oracle.coherence.common.io;
88

99

10+
import com.tangosol.coherence.config.Config;
11+
1012
import java.io.IOException;
1113
import java.nio.ByteBuffer;
1214
import java.util.concurrent.atomic.AtomicInteger;
@@ -286,6 +288,6 @@ else if (compareAndSet(0, 1))
286288
/**
287289
* True iff dispose locations should be tracked (for debugging)
288290
*/
289-
private static final boolean TRACK_DISPOSE = Boolean.getBoolean(
291+
private static final boolean TRACK_DISPOSE = Config.getBoolean(
290292
BufferSequence.class.getName() + ".trackDispose");
291293
}

prj/coherence-core/src/main/java/com/oracle/coherence/common/io/TripleBufferSequence.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
/*
2-
* Copyright (c) 2000, 2020, Oracle and/or its affiliates.
2+
* Copyright (c) 2000, 2024 Oracle and/or its affiliates.
33
*
44
* Licensed under the Universal Permissive License v 1.0 as shown at
5-
* http://oss.oracle.com/licenses/upl.
5+
* https://oss.oracle.com/licenses/upl.
66
*/
77
package com.oracle.coherence.common.io;
88

99

10+
import com.tangosol.coherence.config.Config;
11+
1012
import java.io.IOException;
1113
import java.nio.ByteBuffer;
1214
import java.util.concurrent.atomic.AtomicInteger;
@@ -387,6 +389,6 @@ else if ((n & 0x0100) == 0 && compareAndSet(n, n | 0x0100))
387389
/**
388390
* True iff dispose locations should be tracked (for debugging)
389391
*/
390-
private static final boolean TRACK_DISPOSE = Boolean.getBoolean(
392+
private static final boolean TRACK_DISPOSE = Config.getBoolean(
391393
BufferSequence.class.getName() + ".trackDispose");
392394
}

0 commit comments

Comments
 (0)