This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a change to branch 3.2
in repository https://gitbox.apache.org/repos/asf/dubbo.git
from 7a774d21a6 Fix conflict
add 1dfd06b381 Fix concurrent issue in scope model (#11525)
add 08d278f3f5 Fix synchronized in ModelEnvironment (#11584)
new 6c062586b4 Merge branch 'apache-3.1' into apache-3.2
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/dubbo/common/config/Environment.java | 2 +-
.../dubbo/common/config/ModuleEnvironment.java | 2 +-
.../apache/dubbo/rpc/model/ApplicationModel.java | 415 +++++++++++----------
.../org/apache/dubbo/rpc/model/FrameworkModel.java | 161 ++++----
.../org/apache/dubbo/rpc/model/ModuleModel.java | 137 +++----
.../org/apache/dubbo/rpc/model/ScopeModel.java | 66 ++--
.../common/CommonScopeModelInitializerTest.java | 6 +-
.../common/config/ConfigurationUtilsTest.java | 6 +-
.../dubbo/common/config/EnvironmentTest.java | 4 +-
.../common/extension/ExtensionDirectorTest.java | 24 +-
.../inject/AdaptiveExtensionInjectorTest.java | 2 +-
.../reporter/FrameworkStatusReportServiceTest.java | 4 +-
.../dubbo/rpc/model/ApplicationModelTest.java | 8 +-
.../apache/dubbo/rpc/model/FrameworkModelTest.java | 2 +-
.../rpc/model/FrameworkServiceRepositoryTest.java | 6 +-
.../apache/dubbo/rpc/model/ModuleModelTest.java | 14 +-
.../rpc/model/ModuleServiceRepositoryTest.java | 6 +-
.../rpc/model/ReflectionServiceDescriptorTest.java | 2 +-
.../ScopeModelAwareExtensionProcessorTest.java | 6 +-
.../org/apache/dubbo/rpc/model/ScopeModelTest.java | 2 +-
.../apache/dubbo/rpc/model/ScopeModelUtilTest.java | 6 +-
.../dubbo/rpc/model/ServiceRepositoryTest.java | 6 +-
.../config/ConfigScopeModelInitializerTest.java | 6 +-
.../apache/dubbo/config/ReferenceConfigTest.java | 8 +-
.../dubbo/config/bootstrap/MultiInstanceTest.java | 2 +-
.../customize/DubboSpringInitCustomizerTest.java | 2 +-
.../dubbo/qos/command/impl/InvokeTelnetTest.java | 4 +-
.../apache/dubbo/qos/command/impl/LiveTest.java | 2 +-
.../org/apache/dubbo/qos/command/impl/LsTest.java | 2 +-
.../apache/dubbo/qos/command/impl/OfflineTest.java | 2 +-
.../apache/dubbo/qos/command/impl/OnlineTest.java | 2 +-
.../qos/command/impl/PublishMetadataTest.java | 2 +-
.../qos/command/impl/SerializeCheckStatusTest.java | 1 +
.../command/impl/SerializeWarnedClassesTest.java | 1 +
.../qos/command/util/SerializeCheckUtilsTest.java | 1 +
.../metadata/MetadataServiceNameMappingTest.java | 4 +-
.../dubbo/DecodeableRpcInvocationTest.java | 2 +-
.../rpc/protocol/injvm/InjvmClassLoaderTest.java | 5 +-
.../rpc/protocol/injvm/InjvmDeepCopyTest.java | 3 +-
.../tri/service/TriBuiltinServiceTest.java | 4 +-
40 files changed, 487 insertions(+), 453 deletions(-)
