Changeset 6122

Timestamp:

03/31/15 15:54:41 (9 years ago)

Author:

Oliver Schonefeld

Message:

• try to work around circular dependency that confuses Spring

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryImpl.java (modified) (4 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/VirtualCollectionRegistryImpl.java

@@ -45 +45 @@
     private PersistentIdentifierProvider pid_provider;
     @Autowired
-    private OAIProvider oaiProvider;
-    @Autowired
     @Qualifier("creation")
     private VirtualCollectionValidator validator;
@@ -98 +96 @@
         }
 
-        logger.info("Shutting down OAI provider");
-        oaiProvider.shutdown();
+        final OAIProvider oaiProvider = OAIProvider.instance();
+        if (oaiProvider != null) {
+            logger.info("Shutting down OAI provider");
+            oaiProvider.shutdown();
+        }
     }
 
@@ -647 +648 @@
                      * TODO: if an error occurred while minting PID, the VCR
                      * should handle this more gracefully and not stubbornly
-                     * re-try ... 
+                     * re-try ...
                      */
                     PersistentIdentifier pid = pid_provider.createIdentifier(vc);
@@ -704 +705 @@
     private static ScheduledExecutorService createSingleThreadScheduledExecutor(final String threadName) {
         return Executors.newSingleThreadScheduledExecutor(new ThreadFactory() {
-            // decorate default thread factory so that we can provide a 
+            // decorate default thread factory so that we can provide a
             // custom thread name
             final AtomicInteger i = new AtomicInteger(0);