[SHIBUI-703]

Added in a doInitialization check.
TIER · Nov 12, 2018 · f1b8822 · f1b8822
1 parent 3d25388
commit f1b8822
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/...r/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlLocalDynamicMetadataResolver.java b/...r/shibboleth/admin/ui/domain/resolvers/opensaml/OpenSamlLocalDynamicMetadataResolver.java
@@ -38,11 +38,13 @@ public OpenSamlLocalDynamicMetadataResolver(ParserPool parserPool,
 
     @Override
     protected void initMetadataResolver() throws ComponentInitializationException {
-        super.initMetadataResolver();
+        if (sourceResolver.getDoInitialization()) {
+            super.initMetadataResolver();
 
-        delegate.addIndexedDescriptorsFromBackingStore(this.getBackingStore(),
-                                                       this.sourceResolver.getResourceId(),
-                                                       indexWriter);
+            delegate.addIndexedDescriptorsFromBackingStore(this.getBackingStore(),
+                    this.sourceResolver.getResourceId(),
+                    indexWriter);
+        }
     }
 
     public void refresh() throws ComponentInitializationException {

diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java b/.../edu/internet2/tier/shibboleth/admin/ui/service/MetadataResolverConverterServiceImpl.java
@@ -79,12 +79,15 @@ private OpenSamlLocalDynamicMetadataResolver convertToOpenSamlRepresentation(Loc
         IndexWriter indexWriter = indexWriterService.getIndexWriter(resolver.getResourceId());
 
         XMLObjectLoadSaveManager manager = null;
-        try {
-            manager = new FilesystemLoadSaveManager(placeholderResolverService()
-                    .resolveValueFromPossibleTokenPlaceholder(resolver.getSourceDirectory()));
-        } catch (ConstraintViolationException e) {
-            // the base directory string instance was null or empty
-            //TODO: What should we do here? Currently, this causes a test to fail.
+        if (resolver.getDoInitialization()) {
+            try {
+                manager = new FilesystemLoadSaveManager(placeholderResolverService()
+                        .resolveValueFromPossibleTokenPlaceholder(resolver.getSourceDirectory()));
+            } catch (ConstraintViolationException e) {
+                // the base directory string instance was null or empty
+                //TODO: What should we do here? Currently, this causes a test to fail.
+                throw new RuntimeException("An exception occurred while attempting to instantiate a FilesystemLoadSaveManger for the path: " + resolver.getSourceDirectory(), e);
+            }
         }
 
         OpenSamlLocalDynamicMetadataResolver openSamlResolver = new OpenSamlLocalDynamicMetadataResolver(openSamlObjects.getParserPool(), indexWriter, resolver, manager);