File tree Expand file tree Collapse file tree 2 files changed +12
-4
lines changed
dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config Expand file tree Collapse file tree 2 files changed +12
-4
lines changed Original file line number Diff line number Diff line change @@ -349,20 +349,21 @@ protected void init(boolean check) {
349
349
initServiceMetadata (consumer );
350
350
351
351
serviceMetadata .setServiceType (getServiceInterfaceClass ());
352
- // TODO, uncomment this line once service key is unified
353
- serviceMetadata .generateServiceKey ();
354
-
355
- Map <String , String > referenceParameters = appendConfig ();
356
352
357
353
ModuleServiceRepository repository = getScopeModel ().getServiceRepository ();
358
354
ServiceDescriptor serviceDescriptor ;
359
355
if (CommonConstants .NATIVE_STUB .equals (getProxy ())) {
360
356
serviceDescriptor = StubSuppliers .getServiceDescriptor (interfaceName );
361
357
repository .registerService (serviceDescriptor );
362
358
setInterface (serviceDescriptor .getInterfaceName ());
359
+ serviceMetadata .setServiceInterfaceName (serviceDescriptor .getInterfaceName ());
363
360
} else {
364
361
serviceDescriptor = repository .registerService (interfaceClass );
365
362
}
363
+ serviceMetadata .generateServiceKey ();
364
+
365
+ Map <String , String > referenceParameters = appendConfig ();
366
+
366
367
consumerModel = new ConsumerModel (
367
368
serviceMetadata .getServiceKey (),
368
369
proxy ,
Original file line number Diff line number Diff line change 49
49
import org .apache .dubbo .rpc .RpcInvocation ;
50
50
import org .apache .dubbo .rpc .ServerService ;
51
51
import org .apache .dubbo .rpc .cluster .ConfiguratorFactory ;
52
+ import org .apache .dubbo .rpc .model .DubboStub ;
52
53
import org .apache .dubbo .rpc .model .ModuleModel ;
53
54
import org .apache .dubbo .rpc .model .ModuleServiceRepository ;
54
55
import org .apache .dubbo .rpc .model .ProviderModel ;
55
56
import org .apache .dubbo .rpc .model .ScopeModel ;
56
57
import org .apache .dubbo .rpc .model .ServiceDescriptor ;
57
58
import org .apache .dubbo .rpc .service .GenericService ;
59
+ import org .apache .dubbo .rpc .stub .StubSuppliers ;
58
60
59
61
import java .beans .Transient ;
60
62
import java .lang .reflect .Method ;
@@ -303,6 +305,11 @@ public void init() {
303
305
initServiceMetadata (provider );
304
306
serviceMetadata .setServiceType (getInterfaceClass ());
305
307
serviceMetadata .setTarget (getRef ());
308
+ if (DubboStub .class .isAssignableFrom (getInterfaceClass ())) {
309
+ ServiceDescriptor serviceDescriptor = StubSuppliers .getServiceDescriptor (interfaceName );
310
+ setInterface (serviceDescriptor .getInterfaceName ());
311
+ serviceMetadata .setServiceInterfaceName (serviceDescriptor .getInterfaceName ());
312
+ }
306
313
serviceMetadata .generateServiceKey ();
307
314
}
308
315
You can’t perform that action at this time.
0 commit comments