Merge pull request #283 from oracle/atpfix4cmdargs

fix the npe caused by another option - domain_home

Author: rakillen

core/src/main/python/create.py

@@ -10,6 +10,7 @@
 from java.lang import IllegalArgumentException
 from java.lang import IllegalStateException
 from java.lang import String
+from java.lang.System import System
 from oracle.weblogic.deploy.create import CreateException
 from oracle.weblogic.deploy.deploy import DeployException
 from oracle.weblogic.deploy.util import CLAException
@@ -341,7 +342,8 @@ def validateRCUArgsAndModel(model_context, model):
         has_atpdbinfo = atp_helper.has_atpdbinfo(rcu_db_info)
 
         if model_context.get_archive_file_name() and not has_regular_db:
-            os.environ['oracle.jdbc.fanEnabled'] = 'false'
+            System.setProperty('oracle.jdbc.fanEnabled', 'false')
+
             # 1. If it does not have the oracle.net.tns_admin specified, then extract to domain/atpwallet
             # 2. If it is plain old regular oracle db, do nothing
             # 3. If it deos not have tns_admin in the model, then the wallet must be in the archive

core/src/main/python/wlsdeploy/tool/create/atp_helper.py

@@ -184,8 +184,12 @@ def is_regular_db(rcu_db_info):
 
 
 def extract_walletzip(model, model_context, archive_file, atp_path):
-    domain_path = model_context.get_domain_parent_dir() + os.sep + model[model_constants.TOPOLOGY][
-        'Name']
+    domain_parent = model_context.get_domain_parent_dir()
+    if domain_parent is None:
+        domain_path = model_context.get_domain_home()
+    else:
+        domain_path = domain_parent + os.sep + model[model_constants.TOPOLOGY][
+            'Name']
     extract_path = domain_path +  os.sep + 'atpwallet'
     extract_dir = File(extract_path)
     extract_dir.mkdirs()