You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/03/24 22:10:26 UTC

[jspwiki] 10/15: retrieve all pages and attachments only if we have to build the reference manager

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git

commit 95c78ce6502d0da7f5ba85f7a914f9fcab650eee
Author: juanpablo <ju...@apache.org>
AuthorDate: Tue Mar 24 17:33:58 2020 +0100

    retrieve all pages and attachments only if we have to build the reference manager
---
 jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
index 8b963e7..54441db 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiEngine.java
@@ -584,15 +584,16 @@ public class WikiEngine implements Engine {
      */
     public void initReferenceManager() throws WikiException {
         try {
-            final ArrayList< Page > pages = new ArrayList<>();
-            pages.addAll( getManager( PageManager.class ).getAllPages() );
-            pages.addAll( getManager( AttachmentManager.class ).getAllAttachments() );
-
             // Build a new manager with default key lists.
             if( getManager( ReferenceManager.class ) == null ) {
-                m_referenceManager = ClassUtil.getMappedObject(ReferenceManager.class.getName(), this );
-                m_referenceManager.initialize( pages );
+                final ArrayList< Page > pages = new ArrayList<>();
+                pages.addAll( getManager( PageManager.class ).getAllPages() );
+                pages.addAll( getManager( AttachmentManager.class ).getAllAttachments() );
+
+                m_referenceManager = ClassUtil.getMappedObject( ReferenceManager.class.getName(), this );
                 managers.put( ReferenceManager.class, m_referenceManager );
+
+                m_referenceManager.initialize( pages );
             }
 
         } catch( final ProviderException e ) {