You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@turbine.apache.org by tv...@apache.org on 2010/07/25 17:01:55 UTC

svn commit: r979047 - /turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java

Author: tv
Date: Sun Jul 25 15:01:55 2010
New Revision: 979047

URL: http://svn.apache.org/viewvc?rev=979047&view=rev
Log:
RunData.getContentType() was returning an empty string when it shouldn't

Modified:
    turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java

Modified: turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java?rev=979047&r1=979046&r2=979047&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java Sun Jul 25 15:01:55 2010
@@ -40,6 +40,9 @@ import org.apache.ecs.Document;
 import org.apache.ecs.Element;
 import org.apache.ecs.StringElement;
 import org.apache.fulcrum.mimetype.MimeTypeService;
+import org.apache.fulcrum.parser.CookieParser;
+import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.fulcrum.pool.Recyclable;
 import org.apache.turbine.Turbine;
 import org.apache.turbine.TurbineConstants;
 import org.apache.turbine.om.security.User;
@@ -50,9 +53,6 @@ import org.apache.turbine.services.templ
 import org.apache.turbine.util.FormMessages;
 import org.apache.turbine.util.ServerData;
 import org.apache.turbine.util.SystemError;
-import org.apache.fulcrum.parser.CookieParser;
-import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.fulcrum.pool.Recyclable;
 import org.apache.turbine.util.security.AccessControlList;
 import org.apache.turbine.util.template.TemplateInfo;
 
@@ -1046,6 +1046,8 @@ public class DefaultTurbineRunData
                 {
                     return contentType + "; charset=" + getDefaultCharSet();
                 }
+                
+                return contentType;
             }
             else
             {