1 files changed, 6 insertions, 0 deletions
diff --git a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
index f3bbf4477..603fc6b8f 100755
--- a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
+++ b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
@@ -45,9 +45,15 @@ class MoveWebApplicationContextFile(pki.server.upgrade.PKIServerUpgradeScriptlet
     def upgrade_webapp(self, instance, webapp):
 
         metainf_dir = os.path.join(instance.base_dir, 'webapps', webapp, 'META-INF')
+        if not os.path.exists(metainf_dir):
+            # upgrade already done
+            return
         self.backup(metainf_dir)
 
         old_context_file = os.path.join(metainf_dir, 'context.xml')
+        if not os.path.exists(old_context_file):
+            # upgrade already done
+            return
         self.backup(old_context_file)
 
         catalina_dir = os.path.join(instance.base_dir, 'conf', 'Catalina')