@@ -98,9 +98,8 @@ def get_application_versioned_name(self, source_path, model_name, from_archive=F
98
98
99
99
self .logger .entering (source_path , model_name , class_name = self ._class_name , method_name = _method_name )
100
100
101
- # discard any version information in the model name
102
- model_name_tuple = deployer_utils .get_library_name_components (model_name )
103
- versioned_name = model_name_tuple [self ._EXTENSION_INDEX ]
101
+ # if no manifest version is found, leave the original name unchanged
102
+ versioned_name = model_name
104
103
105
104
try :
106
105
manifest = self .__get_manifest (source_path , from_archive )
@@ -109,7 +108,10 @@ def get_application_versioned_name(self, source_path, model_name, from_archive=F
109
108
attributes = manifest .getMainAttributes ()
110
109
application_version = attributes .getValue (self ._APP_VERSION_MANIFEST_KEY )
111
110
if application_version is not None :
112
- versioned_name = model_name + '#' + application_version
111
+ # replace any version information in the model name
112
+ model_name_tuple = deployer_utils .get_library_name_components (model_name )
113
+ versioned_name = model_name_tuple [self ._EXTENSION_INDEX ]
114
+ versioned_name = versioned_name + '#' + application_version
113
115
self .logger .info ('WLSDPLY-09328' , model_name , versioned_name , class_name = self ._class_name ,
114
116
method_name = _method_name )
115
117
0 commit comments