save my changes

Author: CarolynRountree

core/src/main/python/wlsdeploy/tool/discover/discoverer.py

@@ -84,6 +84,7 @@ def _populate_model_parameters(self, dictionary, location):
                                         method_name=_method_name)
                         continue
                 else:
+                    _logger.finer('WLSDPLY-06131', wlst_param, class_name=_class_name, method_name=_method_name)
                     wlst_value = wlst_params[wlst_param]
 
                 # if type(wlst_value) == str and len(wlst_value) == 0:

core/src/main/python/wlsdeploy/util/model_context.py

@@ -502,18 +502,18 @@ def tokenize_path(self, path):
         cwd = path_utils.fixup_path(os.path.dirname(os.path.abspath(__file__)))
 
         # decide later what is required to be in context home for appropriate exception prevention
-        if self.get_wl_home() and my_path.startswith(self.get_wl_home()):
-            result = my_path.replace(self.get_wl_home(), self.__WL_HOME_TOKEN)
-        elif self.get_domain_home() and  my_path.startswith(self.get_domain_home()):
-            result = my_path.replace(self.get_domain_home(), self.__DOMAIN_HOME_TOKEN)
-        elif self.get_oracle_home() and my_path.startswith(self.get_oracle_home()):
-            result = my_path.replace(self.get_oracle_home(), self.__ORACLE_HOME_TOKEN)
-        elif my_path.startswith(cwd):
-            result = my_path.replace(cwd, self.__CURRENT_DIRECTORY_TOKEN)
-        elif my_path.startswith(tmp_dir):
-            result = my_path.replace(tmp_dir, self.__TEMP_DIRECTORY_TOKEN)
-        else:
-            result = my_path
+        result = my_path
+        if my_path:
+            if self.get_wl_home() and my_path.startswith(self.get_wl_home()):
+                result = my_path.replace(self.get_wl_home(), self.__WL_HOME_TOKEN)
+            elif self.get_domain_home() and  my_path.startswith(self.get_domain_home()):
+                result = my_path.replace(self.get_domain_home(), self.__DOMAIN_HOME_TOKEN)
+            elif self.get_oracle_home() and my_path.startswith(self.get_oracle_home()):
+                result = my_path.replace(self.get_oracle_home(), self.__ORACLE_HOME_TOKEN)
+            elif my_path.startswith(cwd):
+                result = my_path.replace(cwd, self.__CURRENT_DIRECTORY_TOKEN)
+            elif my_path.startswith(tmp_dir):
+                result = my_path.replace(tmp_dir, self.__TEMP_DIRECTORY_TOKEN)
 
         return result
 

core/src/main/resources/oracle/weblogic/deploy/messages/wlsdeploy_rb.properties

@@ -458,6 +458,7 @@ WLSDPLY-06127=Unable to discover attribute {0} at location {1} under wls version
   will not be added to the model : {4}
 WLSDPLY-06130=Unexpected exception attempting to discover MBean entries at location {0} will prevent the discovery \
   of attributes at this location : {1}
+WLSDPLY-06131=Attribute {0} retrieved from lsa() map
 
 # resources_discoverer.py
 WLSDPLY-06300=Discovering domain model resources