svn commit: r1096586 - /turbine/core/trunk/src/java/org/apache/turbine/Turbine.java

[lu...@apache.org]

Author: ludwig
Date: Mon Apr 25 20:31:43 2011
New Revision: 1096586

URL: http://svn.apache.org/viewvc?rev=1096586&view=rev
Log:
Fixed encoding problem

Modified:
    turbine/core/trunk/src/java/org/apache/turbine/Turbine.java

Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1096586&r1=1096585&r2=1096586&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Mon Apr 25 20:31:43 2011
@@ -374,6 +374,16 @@ public class Turbine
         configuration.setProperty(TurbineConstants.APPLICATION_ROOT_KEY, applicationRoot);
         configuration.setProperty(TurbineConstants.WEBAPP_ROOT_KEY, webappRoot);
 
+        // Get the default input encoding
+        inputEncoding = configuration.getString(
+                TurbineConstants.PARAMETER_ENCODING_KEY,
+                TurbineConstants.PARAMETER_ENCODING_DEFAULT);
+
+        if (log.isDebugEnabled())
+        {
+            log.debug("Input Encoding has been set to " + inputEncoding);
+        }        
+        
         getServiceManager().setConfiguration(configuration);
 
         // Initialize the service manager. Services
@@ -971,6 +981,16 @@ public class Turbine
         return data;
     }
 
+
+    /**
+     * Returns the default input encoding for the servlet.
+     * 
+     * @return the default input encoding.
+     */
+    public String getDefaultInputEncoding() {
+        return inputEncoding;
+    }
+    
     /**
      * Static Helper method for looking up the RunDataService
      * @return A RunDataService