You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/11/25 04:44:52 UTC

svn commit: r348864 - in /incubator/roller/trunk/src/org/roller/presentation/velocity: ContextLoader.java PageHelper.java

Author: snoopdave
Date: Thu Nov 24 19:44:49 2005
New Revision: 348864

URL: http://svn.apache.org/viewcvs?rev=348864&view=rev
Log:
Fixing critical ordering problem in plugin maps

Modified:
    incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java
    incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java

Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java?rev=348864&r1=348863&r2=348864&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java Thu Nov 24 19:44:49 2005
@@ -5,7 +5,7 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
@@ -57,7 +57,7 @@
     private RollerRequest mRollerReq = null;
     
     // Plugin classes keyed by plugin name
-    static Map mPagePlugins = new HashMap();
+    static Map mPagePlugins = new LinkedHashMap();
     
     private static Log mLogger = 
        LogFactory.getFactory().getInstance(ContextLoader.class);
@@ -330,7 +330,7 @@
         
         int entryCount = 15;
         String sCount = request.getParameter("count");
-        if ( sCount!=null && sExcerpts.trim().equals(""))
+        if ( sCount!=null && sExcerpts!=null && sExcerpts.trim().equals(""))
         {
             try
             {

Modified: incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java?rev=348864&r1=348863&r2=348864&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/velocity/PageHelper.java Thu Nov 24 19:44:49 2005
@@ -1,9 +1,8 @@
 package org.roller.presentation.velocity;
 import java.net.MalformedURLException;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -19,7 +18,6 @@
 import org.apache.struts.util.RequestUtils;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.Context;
-import org.roller.RollerException;
 import org.roller.pojos.WeblogEntryData;
 import org.roller.pojos.WebsiteData;
 import org.roller.pojos.wrapper.RefererDataWrapper;
@@ -52,7 +50,7 @@
     private PageContext          mPageContext = null;
     private HttpServletResponse  mResponse = null;     
     private RollerRequest        mRollerReq = null;  
-    private Map                  mPagePlugins = new HashMap();  // Plugins keyed by name   
+    private Map                  mPagePlugins = new LinkedHashMap();  // Plugins keyed by name   
     private boolean              mSkipFlag = false;
     private WebsiteData          mWebsite = null;