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 2a7dd3dc29 Fix error code in 3.2 branch (#11199)
add f5a5fa29a4 npe fix (#11192)
add 0e549fb064 Turn on error reporting of Error Code Inspector. (#11182)
add 513bdf56b0 1.test JSONObject to personMap pojo, the personMap extends
HashMap (#11177)
add 0d02c79542 Fix Spring Cloud metadata override (#11197)
add 98c2f39090 Fix deadlocks in lazy-init situations. (#11194)
add a7592e3bea Fix warn when port are the same (#11202)
add 58131051c3 Fix active limit filter not work (#11206)
add 992e125a1a Merge error code 1-36 to 99-0. (#11207)
add 1ecc00a713 Fix Nacos empty ticket not work (#11213)
add e86e6e3209 Fix zookeeper instance update (#11212)
new 0e4997b252 Merge branch 'apache-3.1' into apache-3.2
new f5df7edcdf resolve conflict
The 2 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:
.github/workflows/build-and-test-pr.yml | 6 +++--
.github/workflows/build-and-test-scheduled-3.1.yml | 6 +++--
.github/workflows/build-and-test-scheduled-3.2.yml | 6 +++--
.github/workflows/release-test-3.1.yml | 6 +++--
.../wrapper/CompositeDynamicConfiguration.java | 4 +--
.../common/constants/LoggerCodeConstants.java | 21 +++++++++++----
.../dubbo/common/model/person/PersonMap.java | 31 ++++++++++++----------
.../apache/dubbo/common/utils/PojoUtilsTest.java | 12 ++++++++-
.../apache/dubbo/config/spring/ReferenceBean.java | 8 +++++-
.../metadata/store/nacos/NacosMetadataReport.java | 2 +-
.../dubbo/registry/ListenerRegistryWrapper.java | 4 +--
.../registry/client/ServiceDiscoveryRegistry.java | 16 +++++------
.../listener/ServiceInstancesChangedListener.java | 14 +++++-----
.../client/metadata/MetadataServiceDelegation.java | 6 +++++
.../metadata/MetadataServiceNameMapping.java | 4 +--
.../metadata/ProtocolPortsMetadataCustomizer.java | 4 +--
...CloudServiceInstanceNotificationCustomizer.java | 3 ++-
.../client/migration/MigrationRuleHandler.java | 4 +--
.../client/migration/MigrationRuleListener.java | 8 +++---
.../registry/integration/RegistryProtocol.java | 10 +++----
.../dubbo/registry/support/AbstractRegistry.java | 4 +--
.../dubbo/registry/support/FailbackRegistry.java | 6 ++---
.../dubbo/registry/support/RegistryManager.java | 4 +--
.../zookeeper/ZookeeperServiceDiscovery.java | 15 +++++++++++
.../dubbo/internal/org.apache.dubbo.rpc.Filter | 1 +
25 files changed, 133 insertions(+), 72 deletions(-)
copy dubbo-compatible/src/test/java/org/apache/dubbo/cache/MyCache.java =>
dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonMap.java
(61%)