From dbe45ccf6a27755d4c66090860b886d1a0eee0e7 Mon Sep 17 00:00:00 2001
From: Kevin Roast <kevin.roast@alfresco.com>
Date: Thu, 25 Mar 2010 11:54:59 +0000
Subject: [PATCH] Merged V3.2 to HEAD    19580: Fix for ALF-1612 - set default
 encoding for create-inline content in Explorer Client to sensible default.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19581 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/web/bean/content/BaseContentWizard.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
index 394b4ea21c..5c20948f02 100644
--- a/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
+++ b/source/java/org/alfresco/web/bean/content/BaseContentWizard.java
@@ -20,7 +20,6 @@ package org.alfresco.web.bean.content;
 
 import java.io.File;
 import java.io.Serializable;
-import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -180,7 +179,8 @@ public abstract class BaseContentWizard extends BaseWizardBean
          }
          if (encoding == null || encoding.length() == 0)
          {
-            encoding = Charset.defaultCharset().name();
+            // if not configured, set to a sensible default for most character sets
+            encoding = "UTF-8";
          }
       }
       return encoding;